More tests

Author: noirbizarre

Diff for: djangojs/settings.py

@@ -1,6 +1,8 @@
 # Django settings for Django JS project.
+import sys
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
+TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
 
 ADMINS = (
     # ('Your Name', '[email protected]'),

Diff for: djangojs/tests.py

@@ -25,9 +25,10 @@ def phantomjs(self, *args, **kwargs):
 
 
 class JasmineTests(JsTestCase):
+    urls = 'djangojs.urls'
 
     def test_jasmine_suite(self):
-        '''It shoudl run its its own Jasmine test suite'''
+        '''It should run its its own Jasmine test suite'''
         jasmine_runner_url = ''.join([self.live_server_url, reverse('jasmine_runner')])
         phantomjs_jasmine_runner = join(dirname(__file__), 'phantomjs', 'run-jasmine.js')
 
@@ -37,9 +38,73 @@ def test_jasmine_suite(self):
 
 
 class DjangoJsJsonTest(TestCase):
+    urls = 'djangojs.urls'
 
-    def test_should_render(self):
+    def setUp(self):
+        self.response = self.client.get(reverse('django_js_json'))
+        self.json = json.loads(self.response.content)
+
+    def test_render(self):
         '''It should render a JSON URLs descriptor'''
-        response = self.client.get(reverse('django_js_json'))
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'application/json')
+        self.assertIsNotNone(self.response)
+        self.assertEqual(self.response.status_code, 200)
+        self.assertEqual(self.response['Content-Type'], 'application/json')
+        self.assertIsNotNone(self.json)
+
+    def test_simple_url(self):
+        '''It should serialize a simple URL without parameters'''
+        self.assertTrue('django_js_json' in self.json)
+        self.assertEqual(self.json['django_js_json'], '/urls')
+
+    def test_url_an_arg(self):
+        '''It should serialize an URL with a single anonymous parameter'''
+        self.assertTrue('test_arg' in self.json)
+        self.assertEqual(self.json['test_arg'], '/tests/arg/<>')
+
+    def test_url_many_args(self):
+        '''It should serialize an URL with many anonymous parameters'''
+        self.assertTrue('test_arg_multi' in self.json)
+        self.assertEqual(self.json['test_arg_multi'], '/tests/arg/<>/<>')
+
+    def test_url_a_kwarg(self):
+        '''It should serialize an URL with a single named parameter'''
+        self.assertTrue('test_named' in self.json)
+        self.assertEqual(self.json['test_named'], '/tests/named/<test>')
+
+    def test_url_many_kwargs(self):
+        '''It should serialize an URL with many named parameters'''
+        self.assertTrue('test_named_multi' in self.json)
+        self.assertEqual(self.json['test_named_multi'], '/tests/named/<str>/<num>')
+
+    def test_unnamed_url(self):
+        '''It should not serialize unnamed URLs'''
+        self.assertFalse('' in self.json)
+        for key, value in self.json.iteritems():
+            self.assertNotEqual(value, '/tests/anonymous')
+
+    def test_optionnal_chars(self):
+        '''It should not serialize optionnal characters (take the shortest)'''
+        self.assertTrue('opt' in self.json)
+        url = self.json['opt']
+        self.assertFalse('?' in url)
+        self.assertEqual(url, '/tests/optionnal')
+
+        self.assertTrue('opt_multi' in self.json)
+        url = self.json['opt_multi']
+        self.assertFalse('?' in url)
+        self.assertEqual(url, '/tests/man/optionnal')
+
+    def test_optionnal_groups(self):
+        '''It should not serialize optionnal non capturing groups'''
+        self.assertTrue('opt_grp' in self.json)
+        url = self.json['opt_grp']
+        self.assertFalse('?' in url)
+        self.assertEqual(url, '/tests/optionnal/group')
+
+
+class VerbatimTagTest(TestCase):
+    urls = 'djangojs.urls'
+
+
+class DjangoJsTagTest(TestCase):
+    urls = 'djangojs.urls'

Diff for: djangojs/urls.py

@@ -25,9 +25,13 @@
 
 if settings.DEBUG or settings.TESTING:
     urlpatterns += patterns('',
+        url(r'^tests/jasmine$', TemplateView.as_view(template_name='djangojs/test/jasmine-runner.html'), name='jasmine_runner'),
         url(r'^tests/arg/(\d+)$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name='test_arg'),
         url(r'^tests/arg/(\d+)/(\w)$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name='test_arg_multi'),
         url(r'^tests/named/(?P<test>\w+)$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name='test_named'),
         url(r'^tests/named/(?P<str>\w+)/(?P<num>\d+)$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name='test_named_multi'),
-        url(r'^tests/jasmine$', TemplateView.as_view(template_name='djangojs/test/jasmine-runner.html'), name='jasmine_runner'),
+        url(r'^tests/optionnals?$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name="opt"),
+        url(r'^tests/many?/optionnals?$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name="opt_multi"),
+        url(r'^tests/optionnal/(?:capturing)?group$', TemplateView.as_view(template_name='djangojs/test/test1.html'), name="opt_grp"),
+        url(r'^tests/anonymous$', TemplateView.as_view(template_name='djangojs/test/test1.html')),
     )

Diff for: djangojs/views.py

@@ -21,6 +21,8 @@
 
 RE_KWARG = re.compile(r"(\(\?P\<(.*?)\>.*?\))")  # Pattern for recongnizing named parameters in urls
 RE_ARG = re.compile(r"(\(.*?\))")  # Pattern for recognizing unnamed url parameters
+RE_OPT = re.compile(r"\w\?")  # Pattern for recognizing optionnal character
+RE_OPT_GRP = re.compile(r"\(\?\:.*\)\?")  # Pattern for recognizing optionnal group
 
 
 class DjangoJsJsonView(View):
@@ -49,6 +51,16 @@ def get_urls(self, module, prefix=''):
                     full_url = prefix + pattern.regex.pattern
                     for chr in ['^', '$']:
                         full_url = full_url.replace(chr, '')
+                    # remove optionnal non capturing groups
+                    opt_grp_matches = RE_OPT_GRP.findall(full_url)
+                    if opt_grp_matches:
+                        for match in opt_grp_matches:
+                            full_url = full_url.replace(match, '')
+                    # remove optionnal characters
+                    opt_matches = RE_OPT.findall(full_url)
+                    if opt_matches:
+                        for match in opt_matches:
+                            full_url = full_url.replace(match, '')
                     # handle kwargs, args
                     kwarg_matches = RE_KWARG.findall(full_url)
                     if kwarg_matches: