Improved fixture handling in the people module

GeoNode · Nov 10, 2012 · e2b05e3 · e2b05e3
1 parent 5c513a8
commit e2b05e3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/geonode/people/fixtures/data.json → geonode/people/fixtures/people_data.json b/geonode/people/fixtures/data.json → geonode/people/fixtures/people_data.json
@@ -53,5 +53,23 @@
         "model": "auth.user",
         "pk": 4
     },
-    { "fields": { "date_joined": "2011-06-09 15:46:03", "email": "", "first_name": "Norman", "groups": [], "is_active": true, "is_staff": false, "is_superuser": false, "last_login": "2011-06-09 15:46:03", "last_name": "Normandy", "password": "sha1$b0022$1592757da52adeed741051a203fe2d65b6798e83", "user_permissions": [], "username": "norman" },  "model": "auth.user", "pk": 5 }
+    {
+        "pk": 5,
+        "model": "auth.user",
+        "fields": {
+            "username": "bobby",
+            "first_name": "",
+            "last_name": "",
+            "is_active": true,
+            "is_superuser": false,
+            "is_staff": false,
+            "last_login": "2010-06-10 16:59:13",
+            "groups": [],
+            "user_permissions": [],
+            "password": "sha1$8d019$a84eea3f5093eed93bc68bf62fe400f14042ab06",
+            "email": "bobby@bob.com",
+            "date_joined": "2010-06-10 16:58:18"
+        }
+    },
+    { "fields": { "date_joined": "2011-06-09 15:46:03", "email": "", "first_name": "Norman", "groups": [], "is_active": true, "is_staff": false, "is_superuser": false, "last_login": "2011-06-09 15:46:03", "last_name": "Normandy", "password": "sha1$b0022$1592757da52adeed741051a203fe2d65b6798e83", "user_permissions": [], "username": "norman" },  "model": "auth.user", "pk": 6 }
 ]
diff --git a/geonode/people/tests.py b/geonode/people/tests.py
@@ -29,7 +29,7 @@
 
 class PeopleTest(TestCase):
 
-    fixtures = ('test_data.json',)
+    fixtures = ('people_data.json',)
 
     def test_forgot_username(self):
         c = Client()

diff --git a/geonode/security/fixtures/test_data.json → geonode/security/fixtures/security_data.json b/geonode/security/fixtures/test_data.json → geonode/security/fixtures/security_data.json
diff --git a/geonode/tests/smoke.py b/geonode/tests/smoke.py
@@ -28,7 +28,7 @@
 
 class GeoNodeSmokeTests(TestCase):
 
-    fixtures = ['data.json']
+    fixtures = ['people_data.json']
     GEOSERVER = False
 
     def setUp(self):