SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Coloca namespaces nas URLs

pull/271/head
Eduardo Calil 9 years ago
parent
2342ee3beb
commit
506aa077ae
5 changed files with 48 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      materia/test_materia.py
  2. 2
      materia/test_materia_urls.py
  3. 35
      materia/views.py
  4. 20
      parlamentares/test_parlamentares.py
  5. 3
      parlamentares/views.py

30
materia/test_materia.py
View File

@ -98,7 +98,7 @@ def test_materia_anexada_submit(client):
materia_anexada = MateriaLegislativa.objects.get(numero=32, ano=2004) materia_anexada = MateriaLegislativa.objects.get(numero=32, ano=2004)
# Testa POST # Testa POST
response = client.post(reverse('materia_anexada', response = client.post(reverse('materia:materia_anexada',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'tipo': materia_anexada.tipo.pk, {'tipo': materia_anexada.tipo.pk,
'numero': materia_anexada.numero, 'numero': materia_anexada.numero,
@ -125,7 +125,7 @@ def test_autoria_submit(client):
autor = mommy.make(Autor, tipo=tipo_autor, nome='Autor Teste') autor = mommy.make(Autor, tipo=tipo_autor, nome='Autor Teste')
# Testa POST # Testa POST
response = client.post(reverse('autoria', response = client.post(reverse('materia:autoria',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'autor': autor.pk, {'autor': autor.pk,
'primeiro_autor': True, 'primeiro_autor': True,
@ -155,7 +155,7 @@ def test_despacho_inicial_submit(client):
data_criacao='2016-03-18') data_criacao='2016-03-18')
# Testa POST # Testa POST
response = client.post(reverse('despacho_inicial', response = client.post(reverse('materia:despacho_inicial',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'comissao': comissao.pk, {'comissao': comissao.pk,
'salvar': 'salvar'}, 'salvar': 'salvar'},
@ -177,7 +177,7 @@ def test_numeracao_submit(client):
sigla='T2', sigla='T2',
descricao='Teste_2') descricao='Teste_2')
# Testa POST # Testa POST
response = client.post(reverse('numeracao', response = client.post(reverse('materia:numeracao',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'tipo_materia': tipo.pk, {'tipo_materia': tipo.pk,
'numero_materia': '341', 'numero_materia': '341',
@ -209,7 +209,7 @@ def test_documento_acessorio_submit(client):
descricao='Teste') descricao='Teste')
# Testa POST # Testa POST
response = client.post(reverse('documento_acessorio', response = client.post(reverse('materia:documento_acessorio',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'tipo': tipo.pk, {'tipo': tipo.pk,
'nome': 'teste_nome', 'nome': 'teste_nome',
@ -234,7 +234,7 @@ def test_legislacao_citada_submit(client):
norma = make_norma() norma = make_norma()
# Testa POST # Testa POST
response = client.post(reverse('legislacao_citada', response = client.post(reverse('materia:legislacao_citada',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'tipo': norma.tipo.pk, {'tipo': norma.tipo.pk,
'numero': norma.numero, 'numero': norma.numero,
@ -260,7 +260,7 @@ def test_tramitacao_submit(client):
descricao='Status_Teste') descricao='Status_Teste')
# Testa POST # Testa POST
response = client.post( response = client.post(
reverse('tramitacao_materia', reverse('materia:tramitacao_materia',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'unidade_tramitacao_local': make_unidade_tramitacao( {'unidade_tramitacao_local': make_unidade_tramitacao(
'Unidade Local').pk, 'Unidade Local').pk,
@ -287,7 +287,7 @@ def test_tramitacao_submit(client):
@pytest.mark.django_db(transaction=False) @pytest.mark.django_db(transaction=False)
def test_form_errors_anexada(client): def test_form_errors_anexada(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('materia_anexada', response = client.post(reverse('materia:materia_anexada',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -306,7 +306,7 @@ def test_form_errors_anexada(client):
def test_form_errors_autoria(client): def test_form_errors_autoria(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('autoria', response = client.post(reverse('materia:autoria',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'materia_id': materia_principal.pk, {'materia_id': materia_principal.pk,
'partido': '', 'partido': '',
@ -324,7 +324,7 @@ def test_form_errors_autoria(client):
def test_form_errors_despacho_inicial(client): def test_form_errors_despacho_inicial(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('despacho_inicial', response = client.post(reverse('materia:despacho_inicial',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -337,7 +337,7 @@ def test_form_errors_despacho_inicial(client):
def test_form_errors_documento_acessorio(client): def test_form_errors_documento_acessorio(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('documento_acessorio', response = client.post(reverse('materia:documento_acessorio',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -352,7 +352,7 @@ def test_form_errors_documento_acessorio(client):
def test_form_errors_legislacao_citada(client): def test_form_errors_legislacao_citada(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('legislacao_citada', response = client.post(reverse('materia:legislacao_citada',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -369,7 +369,7 @@ def test_form_errors_legislacao_citada(client):
def test_form_errors_numeracao(client): def test_form_errors_numeracao(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('numeracao', response = client.post(reverse('materia:numeracao',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -388,7 +388,7 @@ def test_form_errors_numeracao(client):
def test_form_errors_tramitacao(client): def test_form_errors_tramitacao(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('tramitacao_materia', response = client.post(reverse('materia:tramitacao_materia',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -409,7 +409,7 @@ def test_form_errors_tramitacao(client):
def test_form_errors_relatoria(client): def test_form_errors_relatoria(client):
materia_principal = make_materia_principal() materia_principal = make_materia_principal()
response = client.post(reverse('relatoria', response = client.post(reverse('materia:relatoria',
kwargs={'pk': materia_principal.pk}), kwargs={'pk': materia_principal.pk}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)

2
materia/test_materia_urls.py
View File

@ -1,5 +1,5 @@
from django.core.urlresolvers import reverse
import pytest import pytest
from django.core.urlresolvers import reverse
@pytest.mark.parametrize("test_input,kwargs,expected", [ @pytest.mark.parametrize("test_input,kwargs,expected", [

35
materia/views.py
View File

@ -223,7 +223,7 @@ class MateriaAnexadaEditView(FormView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('materia_anexada', kwargs={'pk': pk}) return reverse('materia:materia_anexada', kwargs={'pk': pk})
class DespachoInicialView(CreateView): class DespachoInicialView(CreateView):
@ -294,7 +294,7 @@ class DespachoInicialEditView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('despacho_inicial', kwargs={'pk': pk}) return reverse('materia:despacho_inicial', kwargs={'pk': pk})
class LegislacaoCitadaView(FormView): class LegislacaoCitadaView(FormView):
@ -355,7 +355,7 @@ class LegislacaoCitadaView(FormView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('legislacao_citada', kwargs={'pk': pk}) return reverse('materia:legislacao_citada', kwargs={'pk': pk})
class LegislacaoCitadaEditView(FormView): class LegislacaoCitadaEditView(FormView):
@ -364,7 +364,7 @@ class LegislacaoCitadaEditView(FormView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('legislacao_citada', kwargs={'pk': pk}) return reverse('materia:legislacao_citada', kwargs={'pk': pk})
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
materia = MateriaLegislativa.objects.get(id=kwargs['pk']) materia = MateriaLegislativa.objects.get(id=kwargs['pk'])
@ -494,7 +494,7 @@ class NumeracaoEditView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('numeracao', kwargs={'pk': pk}) return reverse('materia:numeracao', kwargs={'pk': pk})
class DocumentoAcessorioView(CreateView): class DocumentoAcessorioView(CreateView):
@ -601,7 +601,7 @@ class DocumentoAcessorioEditView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('documento_acessorio', kwargs={'pk': pk}) return reverse('materia:documento_acessorio', kwargs={'pk': pk})
class RelatoriaEditView(FormView): class RelatoriaEditView(FormView):
@ -610,7 +610,7 @@ class RelatoriaEditView(FormView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('relatoria', kwargs={'pk': pk}) return reverse('materia:relatoria', kwargs={'pk': pk})
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
form = RelatoriaForm() form = RelatoriaForm()
@ -667,7 +667,7 @@ class RelatoriaView(FormView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('relatoria', kwargs={'pk': pk}) return reverse('materia:relatoria', kwargs={'pk': pk})
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
form = RelatoriaForm(request.POST) form = RelatoriaForm(request.POST)
@ -807,8 +807,9 @@ def criar_email_confirmacao(request, casa_legislativa, materia, hash_txt=''):
casa_legislativa.uf) casa_legislativa.uf)
base_url = get_base_url(request) base_url = get_base_url(request)
materia_url = reverse('acompanhar_materia', kwargs={'pk': materia.id}) materia_url = reverse('materia:acompanhar_materia',
confirmacao_url = reverse('acompanhar_confirmar', kwargs={'pk': materia.id})
confirmacao_url = reverse('materia:acompanhar_confirmar',
kwargs={'pk': materia.id}) kwargs={'pk': materia.id})
autores = [] autores = []
@ -843,8 +844,10 @@ def criar_email_tramitacao(request, casa_legislativa, materia, hash_txt=''):
casa_legislativa.uf) casa_legislativa.uf)
base_url = get_base_url(request) base_url = get_base_url(request)
url_materia = reverse('acompanhar_materia', kwargs={'pk': materia.id}) url_materia = reverse('materia:acompanhar_materia',
url_excluir = reverse('acompanhar_excluir', kwargs={'pk': materia.id}) kwargs={'pk': materia.id})
url_excluir = reverse('materia:acompanhar_excluir',
kwargs={'pk': materia.id})
autores = [] autores = []
for autoria in materia.autoria_set.all(): for autoria in materia.autoria_set.all():
@ -1027,7 +1030,7 @@ class TramitacaoView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('tramitacao_materia', kwargs={'pk': pk}) return reverse('materia:tramitacao_materia', kwargs={'pk': pk})
class TramitacaoEditView(CreateView): class TramitacaoEditView(CreateView):
@ -1082,7 +1085,7 @@ class TramitacaoEditView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('tramitacao_materia', kwargs={'pk': pk}) return reverse('materia:tramitacao_materia', kwargs={'pk': pk})
class AutoriaView(CreateView): class AutoriaView(CreateView):
@ -1124,7 +1127,7 @@ class AutoriaView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('autoria', kwargs={'pk': pk}) return reverse('materia:autoria', kwargs={'pk': pk})
class AutoriaEditView(CreateView): class AutoriaEditView(CreateView):
@ -1163,7 +1166,7 @@ class AutoriaEditView(CreateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('autoria', kwargs={'pk': pk}) return reverse('materia:autoria', kwargs={'pk': pk})
class ProposicaoListView(ListView): class ProposicaoListView(ListView):

20
parlamentares/test_parlamentares.py
View File

@ -10,10 +10,12 @@ from .models import (Dependente, Filiacao, Legislatura, Mandato, Parlamentar,
def test_cadastro_parlamentar(client): def test_cadastro_parlamentar(client):
mommy.make(Legislatura, pk=5) mommy.make(Legislatura, pk=5)
response = client.get(reverse('parlamentares_cadastro', kwargs={'pk': 5})) response = client.get(reverse('parlamentares:parlamentares_cadastro',
kwargs={'pk': 5}))
assert response.status_code == 200 assert response.status_code == 200
response = client.post(reverse('parlamentares_cadastro', kwargs={'pk': 5}), response = client.post(reverse('parlamentares:parlamentares_cadastro',
kwargs={'pk': 5}),
{'nome_completo': 'Teresa Barbosa', {'nome_completo': 'Teresa Barbosa',
'nome_parlamentar': 'Terezinha', 'nome_parlamentar': 'Terezinha',
'sexo': 'F', 'sexo': 'F',
@ -30,7 +32,7 @@ def test_filiacao_submit(client):
mommy.make(Parlamentar, pk=14) mommy.make(Parlamentar, pk=14)
mommy.make(Partido, pk=32) mommy.make(Partido, pk=32)
client.post(reverse('parlamentares_filiacao', client.post(reverse('parlamentares:parlamentares_filiacao',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'partido': 32, {'partido': 32,
'data': '2016-03-22', 'data': '2016-03-22',
@ -47,7 +49,7 @@ def test_dependente_submit(client):
mommy.make(Partido, pk=32) mommy.make(Partido, pk=32)
mommy.make(TipoDependente, pk=3) mommy.make(TipoDependente, pk=3)
client.post(reverse('parlamentares_dependentes', client.post(reverse('parlamentares:parlamentares_dependentes',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'nome': 'Eduardo', {'nome': 'Eduardo',
'tipo': 3, 'tipo': 3,
@ -63,7 +65,7 @@ def test_dependente_submit(client):
@pytest.mark.django_db(transaction=False) @pytest.mark.django_db(transaction=False)
def test_form_errors_dependente(client): def test_form_errors_dependente(client):
mommy.make(Parlamentar, pk=14) mommy.make(Parlamentar, pk=14)
response = client.post(reverse('parlamentares_dependentes', response = client.post(reverse('parlamentares:parlamentares_dependentes',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)
@ -80,7 +82,7 @@ def test_form_errors_dependente(client):
def test_form_errors_filiacao(client): def test_form_errors_filiacao(client):
mommy.make(Parlamentar, pk=14) mommy.make(Parlamentar, pk=14)
response = client.post(reverse('parlamentares_filiacao', response = client.post(reverse('parlamentares:parlamentares_filiacao',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'partido': '', {'partido': '',
'salvar': 'salvar'}, 'salvar': 'salvar'},
@ -97,7 +99,7 @@ def test_mandato_submit(client):
mommy.make(Parlamentar, pk=14) mommy.make(Parlamentar, pk=14)
mommy.make(Legislatura, pk=5) mommy.make(Legislatura, pk=5)
client.post(reverse('parlamentares_mandato', client.post(reverse('parlamentares:parlamentares_mandato',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'legislatura': 5, {'legislatura': 5,
'data_fim_mandato': '2016-01-01', 'data_fim_mandato': '2016-01-01',
@ -113,7 +115,7 @@ def test_mandato_submit(client):
@pytest.mark.django_db(transaction=False) @pytest.mark.django_db(transaction=False)
def test_form_errors_mandato(client): def test_form_errors_mandato(client):
mommy.make(Parlamentar, pk=14) mommy.make(Parlamentar, pk=14)
response = client.post(reverse('parlamentares_mandato', response = client.post(reverse('parlamentares:parlamentares_mandato',
kwargs={'pk': 14}), kwargs={'pk': 14}),
{'legislatura': '', {'legislatura': '',
'salvar': 'salvar'}, 'salvar': 'salvar'},
@ -131,7 +133,7 @@ def test_form_errors_mandato(client):
def test_incluir_parlamentar_errors(client): def test_incluir_parlamentar_errors(client):
mommy.make(Legislatura, pk=5) mommy.make(Legislatura, pk=5)
response = client.post(reverse('parlamentares_cadastro', response = client.post(reverse('parlamentares:parlamentares_cadastro',
kwargs={'pk': 5}), kwargs={'pk': 5}),
{'salvar': 'salvar'}, {'salvar': 'salvar'},
follow=True) follow=True)

3
parlamentares/views.py
View File

@ -519,7 +519,8 @@ class MandatoEditView(UpdateView):
def get_success_url(self): def get_success_url(self):
pk = self.kwargs['pk'] pk = self.kwargs['pk']
return reverse('parlamentares_mandato', kwargs={'pk': pk}) return reverse('parlamentares:parlamentares_mandato',
kwargs={'pk': pk})
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(MandatoEditView, self).get_context_data(**kwargs) context = super(MandatoEditView, self).get_context_data(**kwargs)

Write Preview
Loading…
Cancel
Save