diff --git a/picampaign/campaign/admin.py b/picampaign/campaign/admin.py index 22b2c9ad46e3aac3dd4a0f948c94ae728b7c8e6a..a4d544999fd3c2fddbada6bc7acda84abc07c07d 100644 --- a/picampaign/campaign/admin.py +++ b/picampaign/campaign/admin.py @@ -25,10 +25,7 @@ class CampaignAdmin(admin.ModelAdmin): return super(CampaignAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - - class CampaignContactAdmin(admin.ModelAdmin): - def get_queryset(self, request): qs = super(CampaignContactAdmin, self).get_queryset(request) if request.user.is_superuser: @@ -38,7 +35,6 @@ class CampaignContactAdmin(admin.ModelAdmin): class ArgumentaryAdmin(admin.ModelAdmin): - def get_queryset(self, request): qs = super(ArgumentaryAdmin, self).get_queryset(request) if request.user.is_superuser: @@ -54,8 +50,6 @@ class ArgumentaryAdmin(admin.ModelAdmin): return super(ArgumentaryAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - - admin.site.register(Campaign, CampaignAdmin) admin.site.register(CampaignContact, CampaignContactAdmin) admin.site.register(Argumentary, ArgumentaryAdmin) diff --git a/picampaign/campaign/tests.py b/picampaign/campaign/test_models.py similarity index 94% rename from picampaign/campaign/tests.py rename to picampaign/campaign/test_models.py index 6ebed0b1f3dbf30fda4c36a84933fcfcc69cbf18..ff1e1dc7e65c452dff49723e870a9af42853be0d 100644 --- a/picampaign/campaign/tests.py +++ b/picampaign/campaign/test_models.py @@ -1,8 +1,10 @@ from django.conf import settings from django.test import TestCase +from django.contrib.auth.models import User from picampaign.campaign.models import Campaign, CampaignContact, Argumentary from picampaign.contact.models import Contact +from picampaign.campaign.admin import CampaignAdmin class ArgumentaryMethodTests(TestCase): def test_str(self): diff --git a/picampaign/contact/tests.py b/picampaign/contact/tests.py index 33613737d17e64fa176706fa077374ab3b784acb..6f58e400e6ef310ce0ba220956935ae368a35ddc 100644 --- a/picampaign/contact/tests.py +++ b/picampaign/contact/tests.py @@ -6,4 +6,3 @@ class ContactMethodsTest(TestCase): def test_full_name(self): contact = Contact(first_name='Victor', last_name='Hugo') self.assertEqual(contact.full_name(), 'Victor Hugo') - diff --git a/tests_coverage.sh b/tests_coverage.sh index 57a50c2676a0eaa804a6c85ba2aa5dedb9eb2f66..e7ed2295e8b2a2deccf2c9c9dc6f1f729f86f7dd 100755 --- a/tests_coverage.sh +++ b/tests_coverage.sh @@ -1,5 +1,4 @@ #!/bin/bash ${VIRTUAL_ENV}/bin/coverage run --source='.' manage.py test --parallel -${VIRTUAL_ENV}/bin/coverage report --omit="${VIRTUAL_ENV}/*",'*__init__.py' -${VIRTUAL_ENV}/bin/coverage report -m --skip-covered --omit="${VIRTUAL_ENV}/*","*__init__.py" +${VIRTUAL_ENV}/bin/coverage report -m --skip-covered --omit="${VIRTUAL_ENV}/*",'*__init__.py',"*/test_*.py"