aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests
diff options
context:
space:
mode:
authorTom Christie2013-03-12 18:49:38 +0000
committerTom Christie2013-03-12 18:49:38 +0000
commite8db504a9802c6dcc111a327f681e01b9b3e2e16 (patch)
treecc85f273295484a0e145eee63b1f8d5af1701572 /rest_framework/tests
parent12ac357559457d1ded341728aaf76408f0417f9b (diff)
parent20880232930dd6f3a1de9dda1546c84b9279a258 (diff)
downloaddjango-rest-framework-e8db504a9802c6dcc111a327f681e01b9b3e2e16.tar.bz2
Merge master
Diffstat (limited to 'rest_framework/tests')
-rw-r--r--rest_framework/tests/relations_pk.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py
index d6ae3176..f08e1808 100644
--- a/rest_framework/tests/relations_pk.py
+++ b/rest_framework/tests/relations_pk.py
@@ -407,14 +407,14 @@ class PKNullableOneToOneTests(TestCase):
target.save()
new_target = OneToOneTarget(name='target-2')
new_target.save()
- source = NullableOneToOneSource(name='source-1', target=target)
+ source = NullableOneToOneSource(name='source-1', target=new_target)
source.save()
def test_reverse_foreign_key_retrieve_with_null(self):
queryset = OneToOneTarget.objects.all()
serializer = NullableOneToOneTargetSerializer(queryset, many=True)
expected = [
- {'id': 1, 'name': 'target-1', 'nullable_source': 1},
- {'id': 2, 'name': 'target-2', 'nullable_source': None},
+ {'id': 1, 'name': 'target-1', 'nullable_source': None},
+ {'id': 2, 'name': 'target-2', 'nullable_source': 1},
]
self.assertEqual(serializer.data, expected)