summaryrefslogtreecommitdiff
path: root/tests/admin_inlines
diff options
context:
space:
mode:
authorJosh Smeaton <josh.smeaton@gmail.com>2015-02-23 11:53:57 +1100
committerJosh Smeaton <josh.smeaton@gmail.com>2015-03-05 10:10:32 +1100
commit39a7eed1bbf12020a077e4bec3d82e08f171a021 (patch)
tree225be14a94d57517d9de646569498eb45d0a4352 /tests/admin_inlines
parentd6969abf239d52f6dfed7384c6ceb7df7e618342 (diff)
Converted test fixtures to setUpTestData methods
Diffstat (limited to 'tests/admin_inlines')
-rw-r--r--tests/admin_inlines/fixtures/admin-views-users.xml17
-rw-r--r--tests/admin_inlines/tests.py27
2 files changed, 18 insertions, 26 deletions
diff --git a/tests/admin_inlines/fixtures/admin-views-users.xml b/tests/admin_inlines/fixtures/admin-views-users.xml
deleted file mode 100644
index aba8f4aace..0000000000
--- a/tests/admin_inlines/fixtures/admin-views-users.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<django-objects version="1.0">
- <object pk="100" model="auth.user">
- <field type="CharField" name="username">super</field>
- <field type="CharField" name="first_name">Super</field>
- <field type="CharField" name="last_name">User</field>
- <field type="CharField" name="email">super@example.com</field>
- <field type="CharField" name="password">sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158</field>
- <field type="BooleanField" name="is_staff">True</field>
- <field type="BooleanField" name="is_active">True</field>
- <field type="BooleanField" name="is_superuser">True</field>
- <field type="DateTimeField" name="last_login">2007-05-30 13:20:10</field>
- <field type="DateTimeField" name="date_joined">2007-05-30 13:20:10</field>
- <field to="auth.group" name="groups" rel="ManyToManyRel"></field>
- <field to="auth.permission" name="user_permissions" rel="ManyToManyRel"></field>
- </object>
-</django-objects>
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index bad1508948..bb9905f87f 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -1,5 +1,6 @@
from __future__ import unicode_literals
+import datetime
import warnings
from django.contrib.admin import ModelAdmin, TabularInline
@@ -23,10 +24,22 @@ from .models import (
INLINE_CHANGELINK_HTML = 'class="inlinechangelink">Change</a>'
+class TestDataMixin(object):
+
+ @classmethod
+ def setUpTestData(cls):
+ # password = "secret"
+ User.objects.create(
+ pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',
+ password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,
+ is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),
+ date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)
+ )
+
+
@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF="admin_inlines.urls")
-class TestInline(TestCase):
- fixtures = ['admin-views-users.xml']
+class TestInline(TestDataMixin, TestCase):
def setUp(self):
holder = Holder(dummy=13)
@@ -353,11 +366,9 @@ class TestInline(TestCase):
@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF="admin_inlines.urls")
-class TestInlineMedia(TestCase):
- fixtures = ['admin-views-users.xml']
+class TestInlineMedia(TestDataMixin, TestCase):
def setUp(self):
-
result = self.client.login(username='super', password='secret')
self.assertEqual(result, True)
@@ -430,8 +441,7 @@ class TestInlineAdminForm(TestCase):
@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF="admin_inlines.urls")
-class TestInlineProtectedOnDelete(TestCase):
- fixtures = ['admin-views-users.xml']
+class TestInlineProtectedOnDelete(TestDataMixin, TestCase):
def setUp(self):
result = self.client.login(username='super', password='secret')
@@ -657,10 +667,9 @@ class TestInlinePermissions(TestCase):
@override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
ROOT_URLCONF="admin_inlines.urls")
-class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
+class SeleniumFirefoxTests(TestDataMixin, AdminSeleniumWebDriverTestCase):
available_apps = ['admin_inlines'] + AdminSeleniumWebDriverTestCase.available_apps
- fixtures = ['admin-views-users.xml']
webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
def test_add_stackeds(self):