diff options
| author | Xavier Ordoquy | 2014-11-26 16:36:56 +0100 | 
|---|---|---|
| committer | Xavier Ordoquy | 2014-11-26 16:36:56 +0100 | 
| commit | f5e5ed0077cc477a7b8af98c7b10d8d3701f1a65 (patch) | |
| tree | 252729a9e61deb0dbc1a098feb1c55eae56ca948 /tests/test_routers.py | |
| parent | 311d315a739f4d1d02e87a09de0bbf9e7b0cee46 (diff) | |
| parent | 2647e1aaaadfc2cfd947c633399dca1060c17401 (diff) | |
| download | django-rest-framework-f5e5ed0077cc477a7b8af98c7b10d8d3701f1a65.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into bugfix/1850
Diffstat (limited to 'tests/test_routers.py')
| -rw-r--r-- | tests/test_routers.py | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/tests/test_routers.py b/tests/test_routers.py index f6f5a977..34306146 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -76,9 +76,10 @@ class TestCustomLookupFields(TestCase):      def setUp(self):          class NoteSerializer(serializers.HyperlinkedModelSerializer): +            url = serializers.HyperlinkedIdentityField(view_name='routertestmodel-detail', lookup_field='uuid') +              class Meta:                  model = RouterTestModel -                lookup_field = 'uuid'                  fields = ('url', 'uuid', 'text')          class NoteViewSet(viewsets.ModelViewSet): @@ -86,8 +87,6 @@ class TestCustomLookupFields(TestCase):              serializer_class = NoteSerializer              lookup_field = 'uuid' -        RouterTestModel.objects.create(uuid='123', text='foo bar') -          self.router = SimpleRouter()          self.router.register(r'notes', NoteViewSet) @@ -98,6 +97,8 @@ class TestCustomLookupFields(TestCase):              url(r'^', include(self.router.urls)),          ) +        RouterTestModel.objects.create(uuid='123', text='foo bar') +      def test_custom_lookup_field_route(self):          detail_route = self.router.urls[-1]          detail_url_pattern = detail_route.regex.pattern | 
