diff options
author | Josh Smeaton <josh.smeaton@gmail.com> | 2015-02-23 11:53:57 +1100 |
---|---|---|
committer | Josh Smeaton <josh.smeaton@gmail.com> | 2015-03-05 10:10:32 +1100 |
commit | 39a7eed1bbf12020a077e4bec3d82e08f171a021 (patch) | |
tree | 225be14a94d57517d9de646569498eb45d0a4352 /tests/proxy_models | |
parent | d6969abf239d52f6dfed7384c6ceb7df7e618342 (diff) | |
download | django-39a7eed1bbf12020a077e4bec3d82e08f171a021.tar.gz |
Converted test fixtures to setUpTestData methods
Diffstat (limited to 'tests/proxy_models')
-rw-r--r-- | tests/proxy_models/fixtures/myhorses.json | 42 | ||||
-rw-r--r-- | tests/proxy_models/tests.py | 15 |
2 files changed, 14 insertions, 43 deletions
diff --git a/tests/proxy_models/fixtures/myhorses.json b/tests/proxy_models/fixtures/myhorses.json deleted file mode 100644 index 97e190a8a2..0000000000 --- a/tests/proxy_models/fixtures/myhorses.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "pk": 100, - "model": "auth.user", - "fields": { - "username": "super", - "first_name": "Super", - "last_name": "User", - "is_active": true, - "is_superuser": true, - "is_staff": true, - "last_login": "2007-05-30 13:20:10", - "groups": [], - "user_permissions": [], - "password": "sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158", - "email": "super@example.com", - "date_joined": "2007-05-30 13:20:10" - } - }, - { - "pk": 100, - "model": "proxy_models.BaseUser", - "fields": { - "name": "Django Pony" - } - }, - { - "pk": 100, - "model": "proxy_models.TrackerUser", - "fields": { - "status": "emperor" - } - }, - { - "pk": 100, - "model": "proxy_models.Issue", - "fields": { - "summary": "Pony's Issue", - "assignee": 100 - } - } -] diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py index 0fd3887fe7..1aea80902e 100644 --- a/tests/proxy_models/tests.py +++ b/tests/proxy_models/tests.py @@ -1,7 +1,10 @@ from __future__ import unicode_literals +import datetime + from django.apps import apps from django.contrib import admin +from django.contrib.auth.models import User as AuthUser from django.contrib.contenttypes.models import ContentType from django.core import checks, exceptions, management from django.core.urlresolvers import reverse @@ -394,7 +397,17 @@ class ProxyModelTests(TestCase): @override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'], ROOT_URLCONF='proxy_models.urls',) class ProxyModelAdminTests(TestCase): - fixtures = ['myhorses'] + + @classmethod + def setUpTestData(cls): + cls.u1 = AuthUser.objects.create( + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', + first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, + date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) + ) + cls.tu1 = ProxyTrackerUser.objects.create(name='Django Pony', status='emperor') + cls.i1 = Issue.objects.create(summary="Pony's Issue", assignee=cls.tu1) def test_cascade_delete_proxy_model_admin_warning(self): """ |