Nothing important.

This commit is contained in:
Robert Kolner committed 2013-10-08 14:18:27 +02:00
1 parent ab0bdcb189
commit b084ac3634
3 files changed
+51 -5

No files matched your search

+26 -1
View File
@@ -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"}}]
[
{
"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
}
]
+22 -1
View File
@@ -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"}}]
[
{
"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
}
]
+3 -3
View File
@@ -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'),
]