2 files changed, 32 insertions, 77 deletions
diff --git a/tests/view_tests/fixtures/testdata.json b/tests/view_tests/fixtures/testdata.json
deleted file mode 100644
index 8663328c9e..0000000000
--- a/tests/view_tests/fixtures/testdata.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-    {
-        "pk": "1",
-        "model": "auth.user",
-        "fields": {
-            "username": "testclient",
-            "first_name": "Test",
-            "last_name": "Client",
-            "is_active": true,
-            "is_superuser": false,
-            "is_staff": false,
-            "last_login": "2006-12-17 07:03:31",
-            "groups": [],
-            "user_permissions": [],
-            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161",
-            "email": "testclient@example.com",
-            "date_joined": "2006-12-17 07:03:31"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "view_tests.author",
-        "fields": {
-            "name": "Boris"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "view_tests.article",
-        "fields": {
-            "author": 1,
-            "title": "Old Article",
-            "slug": "old_article",
-            "date_created": "2001-01-01 21:22:23"
-        }
-    },
-    {
-        "pk": 2,
-        "model": "view_tests.article",
-        "fields": {
-            "author": 1,
-            "title": "Current Article",
-            "slug": "current_article",
-            "date_created": "2007-09-17 21:22:23"
-        }
-    },
-    {
-        "pk": 3,
-        "model": "view_tests.article",
-        "fields": {
-            "author": 1,
-            "title": "Future Article",
-            "slug": "future_article",
-            "date_created": "3000-01-01 21:22:23"
-        }
-    },
-	{
-        "pk": 1,
-        "model": "view_tests.urlarticle",
-        "fields": {
-            "author": 1,
-            "title": "Old Article",
-            "slug": "old_article",
-            "date_created": "2001-01-01 21:22:23"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "sites.site",
-        "fields": {
-            "domain": "testserver",
-            "name": "testserver"
-        }
-    }
-]
diff --git a/tests/view_tests/tests/test_defaults.py b/tests/view_tests/tests/test_defaults.py
index 491e1bd562..0f3f4fe014 100644
--- a/tests/view_tests/tests/test_defaults.py
+++ b/tests/view_tests/tests/test_defaults.py
@@ -1,18 +1,48 @@
 from __future__ import unicode_literals
 
+import datetime
+
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from ..models import UrlArticle
+from ..models import Article, Author, UrlArticle
 
 
 @override_settings(ROOT_URLCONF='view_tests.urls')
 class DefaultsTests(TestCase):
     """Test django views in django/views/defaults.py"""
-    fixtures = ['testdata.json']
     non_existing_urls = ['/non_existing_url/',  # this is in urls.py
                          '/other_non_existing_url/']  # this NOT in urls.py
 
+    @classmethod
+    def setUpTestData(cls):
+        User.objects.create(
+            password='sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161',
+            last_login=datetime.datetime(2006, 12, 17, 7, 3, 31), is_superuser=False, username='testclient',
+            first_name='Test', last_name='Client', email='testclient@example.com', is_staff=False, is_active=True,
+            date_joined=datetime.datetime(2006, 12, 17, 7, 3, 31)
+        )
+        Author.objects.create(name='Boris')
+        Article.objects.create(
+            title='Old Article', slug='old_article', author_id=1,
+            date_created=datetime.datetime(2001, 1, 1, 21, 22, 23)
+        )
+        Article.objects.create(
+            title='Current Article', slug='current_article', author_id=1,
+            date_created=datetime.datetime(2007, 9, 17, 21, 22, 23)
+        )
+        Article.objects.create(
+            title='Future Article', slug='future_article', author_id=1,
+            date_created=datetime.datetime(3000, 1, 1, 21, 22, 23)
+        )
+        UrlArticle.objects.create(
+            title='Old Article', slug='old_article', author_id=1,
+            date_created=datetime.datetime(2001, 1, 1, 21, 22, 23)
+        )
+        Site(id=1, domain='testserver', name='testserver').save()
+
     def test_page_not_found(self):
         "A 404 status is returned by the page_not_found view"
         for url in self.non_existing_urls: