Merge pull request #230 from novafloss/optional-trailing-slash

Make trailing slash not mandatory for the API

Author: mgu

CHANGELOG.rst

@@ -5,7 +5,7 @@ ChangeLog
 master (unreleased)
 ===================
 
-Nothing here yet.
+- Make trailing slash not mandatory for the API (#75)
 
 Release 0.11.0 (2017-05-10)
 ===========================

demo/tests/tests_integration.py

@@ -107,6 +107,18 @@ def test_simple(self):
                 field.accesses.filter(access_id=access, level=level).exists()
             )
 
+    def test_trailing_slash(self):
+        url = reverse('formidable:form_create')
+        self.assertFalse(url.endswith('/'))
+        res = self.client.post(
+            url, form_data, format='json'
+        )
+        self.assertEquals(res.status_code, 201)
+        res = self.client.post(
+            url + '/', form_data, format='json'
+        )
+        self.assertEquals(res.status_code, 201)
+
     def test_fields_slug(self):
         data = deepcopy(form_data)
         # duplicate field
@@ -180,6 +192,40 @@ def test_simple(self):
         self.assertEquals(formidable.description, 'edited description')
         self.assertEquals(Formidable.objects.count(), initial_count)
 
+    def test_trailing_slash_on_put(self):
+        data = {
+            'label': 'edited label',
+            'description': 'edited description',
+            'fields': []
+        }
+        url = self.edit_url
+        self.assertFalse(url.endswith('/'))
+        res = self.client.put(
+            url, data
+        )
+        self.assertEquals(res.status_code, 200)
+        res = self.client.put(
+            url + '/', form_data, format='json'
+        )
+        self.assertEquals(res.status_code, 200)
+
+    def test_trailing_slash_on_get(self):
+        data = {
+            'label': 'edited label',
+            'description': 'edited description',
+            'fields': []
+        }
+        url = self.edit_url
+        self.assertFalse(url.endswith('/'))
+        res = self.client.get(
+            url, data
+        )
+        self.assertEquals(res.status_code, 200)
+        res = self.client.get(
+            url + '/', form_data, format='json'
+        )
+        self.assertEquals(res.status_code, 200)
+
     def test_update_simple_fields(self):
         field = self.form.fields.create(
             type_id='text', slug='textslug', label='mytext',

formidable/urls.py

@@ -3,16 +3,16 @@
 from formidable import views
 
 urlpatterns = [
-    url(r'^forms/(?P<pk>\d+)/$', views.ContextFormDetail.as_view(),
+    url(r'^forms/(?P<pk>\d+)/?$', views.ContextFormDetail.as_view(),
         name='context_form_detail'),
-    url(r'^forms/(?P<pk>\d+)/validate/$', views.ValidateView.as_view(),
+    url(r'^forms/(?P<pk>\d+)/validate/?$', views.ValidateView.as_view(),
         name='form_validation'),
-    url(r'^builder/forms/(?P<pk>\d+)/$', views.FormidableDetail.as_view(),
+    url(r'^builder/forms/(?P<pk>\d+)/?$', views.FormidableDetail.as_view(),
         name='form_detail'),
-    url(r'^builder/forms/$', views.FormidableCreate.as_view(),
+    url(r'^builder/forms/?$', views.FormidableCreate.as_view(),
         name='form_create'),
-    url(r'^builder/accesses/$', views.AccessList.as_view(),
+    url(r'^builder/accesses/?$', views.AccessList.as_view(),
         name='accesses_list'),
-    url(r'^builder/presets', views.PresetsList.as_view(),
+    url(r'^builder/presets/?$', views.PresetsList.as_view(),
         name='presets_list'),
 ]