Merge pull request #334 from mboersma/no-slash

fix(controller): do not require slash at the end of `GET /v2/users`

Author: mboersma

rootfs/api/tests/test_users.py

@@ -11,23 +11,20 @@ class TestUsers(TestCase):
     fixtures = ['tests.json']
 
     def test_super_user_can_list(self):
-        url = '/v2/users/'
-
         user = User.objects.get(username='autotest')
         token = Token.objects.get(user=user)
 
-        response = self.client.get(url,
-                                   HTTP_AUTHORIZATION='token {}'.format(token))
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.data['results']), 3)
+        for url in ['/v2/users', '/v2/users/']:
+            response = self.client.get(url,
+                                       HTTP_AUTHORIZATION='token {}'.format(token))
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(len(response.data['results']), 3)
 
     def test_non_super_user_cannot_list(self):
-        url = '/v2/users/'
-
         user = User.objects.get(username='autotest2')
         token = Token.objects.get(user=user)
 
-        response = self.client.get(url,
-                                   HTTP_AUTHORIZATION='token {}'.format(token))
-        self.assertEqual(response.status_code, 403)
+        for url in ['/v2/users', '/v2/users/']:
+            response = self.client.get(url,
+                                       HTTP_AUTHORIZATION='token {}'.format(token))
+            self.assertEqual(response.status_code, 403)

rootfs/api/urls.py

@@ -103,5 +103,5 @@
     url(r'^certs/?',
         views.CertificateViewSet.as_view({'get': 'list', 'post': 'create'})),
     # list users
-    url(r'^users/', views.UserView.as_view({'get': 'list'})),
+    url(r'^users/?', views.UserView.as_view({'get': 'list'})),
 ]