diff --git a/djadmin2/tests/test_renderers.py b/djadmin2/tests/test_renderers.py index d1689ac..0d5ca81 100644 --- a/djadmin2/tests/test_renderers.py +++ b/djadmin2/tests/test_renderers.py @@ -57,16 +57,16 @@ class DatetimeRendererTest(TestCase): def test_time_german(self): activate('de') - out = self.renderer(dt.time(13, 37, 01), None) + out = self.renderer(dt.time(13, 37, 1), None) self.assertEqual('13:37:01', out) def test_time_chinese(self): activate('zh') - out = self.renderer(dt.time(13, 37, 01), None) + out = self.renderer(dt.time(13, 37, 1), None) self.assertEqual('1:37 p.m.', out) def test_datetime(self): - out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 01), None) + out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 1), None) self.assertEqual('July 6, 2013, 1:37 p.m.', out) # TODO test timezone localization diff --git a/example/blog/tests/test_filters.py b/example/blog/tests/test_filters.py index 6735ab3..f3a8986 100644 --- a/example/blog/tests/test_filters.py +++ b/example/blog/tests/test_filters.py @@ -12,33 +12,30 @@ import djadmin2.filters as djadmin2_filters import django_filters - -class PostAdminSimple(djadmin2.ModelAdmin2): - list_filter = ['published', ] - - -class PostAdminWithFilterInstances(djadmin2.ModelAdmin2): - list_filter = [ - django_filters.BooleanFilter(name='published'), - ] - - -class FS(django_filters.FilterSet): - class Meta: - model = Post - fields = ['published'] - - -class PostAdminWithFilterSetInst(djadmin2.ModelAdmin2): - list_filter = FS - - class ListFilterBuilderTest(TestCase): def setUp(self): self.rf = RequestFactory() def test_filter_building(self): + class PostAdminSimple(djadmin2.ModelAdmin2): + list_filter = ['published', ] + + + class PostAdminWithFilterInstances(djadmin2.ModelAdmin2): + list_filter = [ + django_filters.BooleanFilter(name='published'), + ] + + class FS(django_filters.FilterSet): + class Meta: + model = Post + fields = ['published'] + + + class PostAdminWithFilterSetInst(djadmin2.ModelAdmin2): + list_filter = FS + Post.objects.create(title="post_1_title", body="body") Post.objects.create(title="post_2_title", body="another body") request = self.rf.get(reverse("admin2:dashboard")) diff --git a/example/files/tests/test_views.py b/example/files/tests/test_views.py index 82859eb..1c1721f 100644 --- a/example/files/tests/test_views.py +++ b/example/files/tests/test_views.py @@ -69,7 +69,7 @@ class CaptionedFileDetailViewTest(BaseIntegrationTest): class CaptionedFileCreateViewTest(BaseIntegrationTest): def test_view_ok(self): response = self.client.get(reverse("admin2:files_captionedfile_create")) - self.assertIn('''enctype="multipart/form-data"''', response.content) + self.assertIn('enctype="multipart/form-data"', response.content) self.assertEqual(response.status_code, 200) def test_create_captioned_file(self): diff --git a/example/polls/tests/__init__.py b/example/polls/tests/__init__.py index efb306e..e69de29 100644 --- a/example/polls/tests/__init__.py +++ b/example/polls/tests/__init__.py @@ -1,2 +0,0 @@ -from test_models import * -from test_views import * diff --git a/setup.py b/setup.py index 3fde8bc..eae7502 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ setup( 'django-braces>=1.3.0', 'djangorestframework>=2.3.3', 'django-floppyforms>=1.1', - 'django-filter>=0.6', + 'django-filter>=0.7', 'django-crispy-forms>=1.3.2', 'pytz==2014.7' ], diff --git a/tox.ini b/tox.ini index 27e9087..815c5eb 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ deps = django-braces>=1.3.0 djangorestframework>=2.3.3 django-floppyforms>=1.1 - django-filter>=0.6 + django-filter>=0.7 django-crispy-forms>=1.3.2 django-debug-toolbar>=0.9.4 pytest