From b084ac3634956b81fc956cf413b2e2888020ea3e Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Tue, 8 Oct 2013 14:18:27 +0200
Subject: [PATCH] Nothing important.

---
 dusken/fixtures/address.json | 27 ++++++++++++++++++++++++++-
 dusken/fixtures/country.json | 23 ++++++++++++++++++++++-
 utils/tests.py               |  6 +++---
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/dusken/fixtures/address.json b/dusken/fixtures/address.json
index 865b885..7945171 100644
--- a/dusken/fixtures/address.json
+++ b/dusken/fixtures/address.json
@@ -1 +1,26 @@
-[{"pk": 1, "model": "dusken.address", "fields": {"city": "Oslo", "updated": "2013-08-21T19:37:53.679Z", "created": "2013-08-21T19:37:53.679Z", "country": 1, "postal_code": "1023", "street_address": "Somestreet 1"}}, {"pk": 2, "model": "dusken.address", "fields": {"city": "Amsterdam", "updated": "2013-08-21T19:38:17.664Z", "created": "2013-08-21T19:38:17.664Z", "country": 2, "postal_code": "1432AD", "street_address": "Dutchroad 4"}}]
\ No newline at end of file
+[
+    {
+        "fields": {
+            "city": "Oslo",
+            "country": 1,
+            "created": "2013-08-21T19:37:53.679Z",
+            "postal_code": "1023",
+            "street_address": "Somestreet 1",
+            "updated": "2013-08-21T19:37:53.679Z"
+        },
+        "model": "dusken.address",
+        "pk": 1
+    },
+    {
+        "fields": {
+            "city": "Amsterdam",
+            "country": 2,
+            "created": "2013-08-21T19:38:17.664Z",
+            "postal_code": "1432AD",
+            "street_address": "Dutchroad 4",
+            "updated": "2013-08-21T19:38:17.664Z"
+        },
+        "model": "dusken.address",
+        "pk": 2
+    }
+]
diff --git a/dusken/fixtures/country.json b/dusken/fixtures/country.json
index cc3c1e8..068e0b2 100644
--- a/dusken/fixtures/country.json
+++ b/dusken/fixtures/country.json
@@ -1 +1,22 @@
-[{"pk": 1, "model": "dusken.country", "fields": {"updated": "2013-08-21T19:37:24.851Z", "name": "Norway", "created": "2013-08-21T19:37:24.851Z"}}, {"pk": 2, "model": "dusken.country", "fields": {"updated": "2013-08-21T19:37:31.577Z", "name": "Netherlands", "created": "2013-08-21T19:37:31.577Z"}}]
\ No newline at end of file
+[
+    {
+        "fields": {
+	    "id" : 1,
+            "created": "2013-08-21T19:37:24.851Z",
+            "name": "Norway",
+            "updated": "2013-08-21T19:37:24.851Z"
+        },
+        "model": "dusken.country",
+        "pk": 1
+    },
+    {
+        "fields": {
+	    "id" : 2,
+            "created": "2013-08-21T19:37:31.577Z",
+            "name": "Netherlands",
+            "updated": "2013-08-21T19:37:31.577Z"
+        },
+        "model": "dusken.country",
+        "pk": 2
+    }
+]
diff --git a/utils/tests.py b/utils/tests.py
index 85a5cb2..56c8986 100644
--- a/utils/tests.py
+++ b/utils/tests.py
@@ -1,7 +1,7 @@
 import os.path
 from django.core.management import call_command
 import django
-from dusken.models import Member
+from dusken.models import *
 from tastypie.models import create_api_key
 
 ####################################################################
@@ -39,8 +39,8 @@ def load_test_fixtures():
 
 def test_fixtures_member():
     ''' Returns a list with the locations of all defined fixtures. '''
-    return [os.path.join('dusken', 'fixtures', 'address.json'),
-            os.path.join('dusken', 'fixtures', 'country.json'),
+    return [os.path.join('dusken', 'fixtures', 'country.json'),
+            os.path.join('dusken', 'fixtures', 'address.json'),
             os.path.join('dusken', 'fixtures', 'institution.json'),
            ]