Merge pull request #2 from tomchristie/master

Merge upstream

1 files changed, 0 insertions, 93 deletions

diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py
index 0337f359..b938e385 100644
--- a/tests/test_relations_hyperlink.py
+++ b/tests/test_relations_hyperlink.py
@@ -411,30 +411,6 @@ class HyperlinkedNullableForeignKeyTests(TestCase):
         ]
         self.assertEqual(serializer.data, expected)
 
-#     # reverse foreign keys MUST be read_only
-#     # In the general case they do not provide .remove() or .clear()
-#     # and cannot be arbitrarily set.
-
-    # def test_reverse_foreign_key_update(self):
-    #     data = {'id': 1, 'name': 'target-1', 'sources': [1]}
-    #     instance = ForeignKeyTarget.objects.get(pk=1)
-    #     serializer = ForeignKeyTargetSerializer(instance, data=data)
-    #     print serializer.is_valid()
-    #     print serializer.errors
-    #     print serializer
-    #     self.assertTrue(serializer.is_valid())
-    #     serializer.save()
-    #     self.assertEqual(serializer.data, data)
-
-    #     # Ensure target 1 is updated, and everything else is as expected
-    #     queryset = ForeignKeyTarget.objects.all()
-    #     serializer = ForeignKeyTargetSerializer(queryset, many=True)
-    #     expected = [
-    #         {'id': 1, 'name': 'target-1', 'sources': [1]},
-    #         {'id': 2, 'name': 'target-2', 'sources': []},
-    #     ]
-    #     self.assertEqual(serializer.data, expected)
-
 
 class HyperlinkedNullableOneToOneTests(TestCase):
     urls = 'tests.test_relations_hyperlink'
@@ -455,72 +431,3 @@ class HyperlinkedNullableOneToOneTests(TestCase):
             {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None},
         ]
         self.assertEqual(serializer.data, expected)
-
-
-# # Regression tests for #694 (`source` attribute on related fields)
-
-# class HyperlinkedRelatedFieldSourceTests(TestCase):
-#     urls = 'tests.test_relations_hyperlink'
-
-#     def test_related_manager_source(self):
-#         """
-#         Relational fields should be able to use manager-returning methods as their source.
-#         """
-#         BlogPost.objects.create(title='blah')
-#         field = serializers.HyperlinkedRelatedField(
-#             many=True,
-#             source='get_blogposts_manager',
-#             view_name='dummy-url',
-#         )
-#         field.context = {'request': request}
-
-#         class ClassWithManagerMethod(object):
-#             def get_blogposts_manager(self):
-#                 return BlogPost.objects
-
-#         obj = ClassWithManagerMethod()
-#         value = field.field_to_native(obj, 'field_name')
-#         self.assertEqual(value, ['http://testserver/dummyurl/1/'])
-
-#     def test_related_queryset_source(self):
-#         """
-#         Relational fields should be able to use queryset-returning methods as their source.
-#         """
-#         BlogPost.objects.create(title='blah')
-#         field = serializers.HyperlinkedRelatedField(
-#             many=True,
-#             source='get_blogposts_queryset',
-#             view_name='dummy-url',
-#         )
-#         field.context = {'request': request}
-
-#         class ClassWithQuerysetMethod(object):
-#             def get_blogposts_queryset(self):
-#                 return BlogPost.objects.all()
-
-#         obj = ClassWithQuerysetMethod()
-#         value = field.field_to_native(obj, 'field_name')
-#         self.assertEqual(value, ['http://testserver/dummyurl/1/'])
-
-#     def test_dotted_source(self):
-#         """
-#         Source argument should support dotted.source notation.
-#         """
-#         BlogPost.objects.create(title='blah')
-#         field = serializers.HyperlinkedRelatedField(
-#             many=True,
-#             source='a.b.c',
-#             view_name='dummy-url',
-#         )
-#         field.context = {'request': request}
-
-#         class ClassWithQuerysetMethod(object):
-#             a = {
-#                 'b': {
-#                     'c': BlogPost.objects.all()
-#                 }
-#             }
-
-#         obj = ClassWithQuerysetMethod()
-#         value = field.field_to_native(obj, 'field_name')
-#         self.assertEqual(value, ['http://testserver/dummyurl/1/'])