Merge branch 'default-lookup-field' into 'master'

bugfix: default lookup_field should be pk

See merge request startinblox/djangoldp-packages/djangoldp!49

djangoldp/tests/runner.py

@@ -59,6 +59,7 @@ failures = test_runner.run_tests([
     'djangoldp.tests.tests_anonymous_permissions',
     'djangoldp.tests.tests_update',
     'djangoldp.tests.tests_auto_author',
+    'djangoldp.tests.tests_get',
 ])
 if failures:
     sys.exit(failures)

djangoldp/tests/tests_get.py

+import json
+
+from django.contrib.auth.models import User
+from rest_framework.test import APIRequestFactory, APIClient, APITestCase
+
+from djangoldp.tests.models import Post
+
+
+class TestGET(APITestCase):
+
+    def setUp(self):
+        self.factory = APIRequestFactory()
+        self.client = APIClient()
+        self.user = User.objects.create_user(username='john', email='jlennon@beatles.com', password='glass onion')
+
+    def tearDown(self):
+        self.user.delete()
+
+    def test_get(self):
+        post = Post.objects.create(content="content")
+        response = self.client.get('/posts/{}/'.format(post.pk), content_type='application/ld+json')
+        self.assertEqual(response.status_code, 200)
+        self.assertEquals(response.data['content'], "content")
+        self.assertIn('author', response.data)

djangoldp/urls.py

@@ -30,7 +30,11 @@ for class_name in model_classes:
     urls_fct = model_class.get_view_set().urls
     urlpatterns.append(url(r'^' + path, include(
         urls_fct(model=model_class,
-                 lookup_field=getattr(model_class._meta, 'lookup_field', getattr(model_class.Meta, 'lookup_field', [])),
-                 permission_classes=getattr(model_class._meta, 'permission_classes', getattr(model_class.Meta, 'permission_classes', [])),
-                 fields=getattr(model_class._meta, 'serializer_fields', getattr(model_class.Meta, 'serializer_fields', [])),
-                 nested_fields=getattr(model_class._meta, 'nested_fields', getattr(model_class.Meta, 'nested_fields', []))))))
+                 lookup_field=getattr(model_class._meta, 'lookup_field',
+                                      getattr(model_class.Meta, 'lookup_field', 'pk')),
+                 permission_classes=getattr(model_class._meta, 'permission_classes',
+                                            getattr(model_class.Meta, 'permission_classes', [])),
+                 fields=getattr(model_class._meta, 'serializer_fields',
+                                getattr(model_class.Meta, 'serializer_fields', [])),
+                 nested_fields=getattr(model_class._meta, 'nested_fields',
+                                       getattr(model_class.Meta, 'nested_fields', []))))))