From 50df4c157b57c74d7fcfa328e8fb5fcdc41a519f Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Tue, 8 Aug 2017 16:55:33 -0300 Subject: [PATCH] ajuste teste do travis --- sapl/materia/forms.py | 3 --- sapl/materia/models.py | 4 +--- sapl/materia/tests/test_materia.py | 5 +++++ sapl/materia/views.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 97f41381b..a125c6f84 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -165,9 +165,6 @@ class AcompanhamentoMateriaForm(ModelForm): class DocumentoAcessorioForm(ModelForm): - data = forms.DateField(required=True) - arquivo = forms.FileField(required=True) - class Meta: model = DocumentoAcessorio diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 8d9eae4f5..9eec1b0ce 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -411,14 +411,12 @@ class DocumentoAcessorio(models.Model): on_delete=models.PROTECT, verbose_name=_('Tipo')) nome = models.CharField(max_length=50, verbose_name=_('Nome')) - data = models.DateField(blank=True, null=True, verbose_name=_('Data')) + data = models.DateField(verbose_name=_('Data')) autor = models.CharField( max_length=50, blank=True, verbose_name=_('Autor')) ementa = models.TextField(blank=True, verbose_name=_('Ementa')) indexacao = models.TextField(blank=True) arquivo = models.FileField( - blank=True, - null=True, upload_to=anexo_upload_path, verbose_name=_('Texto Integral'), validators=[restringe_tipos_de_arquivo_txt]) diff --git a/sapl/materia/tests/test_materia.py b/sapl/materia/tests/test_materia.py index 20f3a12fa..6ff2d6d82 100644 --- a/sapl/materia/tests/test_materia.py +++ b/sapl/materia/tests/test_materia.py @@ -217,6 +217,9 @@ def test_documento_acessorio_submit(admin_client): # Cria um tipo de documento tipo = mommy.make(TipoDocumento, descricao='Teste') + + file_content = 'file_content' + arquivo = SimpleUploadedFile("file.txt", file_content.encode('UTF-8')) # Testa POST response = admin_client.post(reverse( @@ -227,6 +230,8 @@ def test_documento_acessorio_submit(admin_client): 'data_materia': '2016-03-21', 'autor': autor, 'ementa': 'teste_ementa', + 'data': '2016-03-21', + 'arquivo': arquivo, 'salvar': 'salvar'}, follow=True) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index e975ff22d..94292b024 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1,5 +1,4 @@ from datetime import datetime, date -from django.utils import timezone from random import choice from string import ascii_letters, digits @@ -1067,7 +1066,8 @@ class DocumentoAcessorioCrud(MasterDetailCrud): super(MasterDetailCrud.CreateView, self).__init__(**kwargs) def get_initial(self): - self.initial['data'] = timezone.now() + self.initial['data'] = datetime.now().date() + return self.initial def get_context_data(self, **kwargs):