Merge pull request #280 from nanaya/fix-null-optional

Fix handling of null optional parameter
tighten · Apr 24, 2020 · c490b70 · c490b70
2 parents 1c8d7b1 + 6846a10
commit c490b70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/js/route.js b/src/js/route.js
@@ -79,9 +79,9 @@ class Router extends String {
                     delete this.urlParams[keyName];
                 }
 
-                // The type of the value is undefined; is this param
+                // The value is null or defined; is this param
                 // optional or not
-                if (typeof tagValue === 'undefined') {
+                if (tagValue == null) {
                     if (tag.indexOf('?') === -1) {
                         throw new Error(
                             "Ziggy Error: '" +

diff --git a/tests/js/test.route.js b/tests/js/test.route.js
@@ -432,6 +432,13 @@ describe('route()', function() {
         );
     });
 
+    it('Should skip the optional parameter `slug` when null', function() {
+        assert.equal(
+            route('optional', { id: 123, slug: null }),
+            'http://myapp.dev/optional/123'
+        );
+    });
+
     it('Should accept the optional parameter `slug`', function() {
         assert.equal(
             route('optional', { id: 123, slug: 'news' }),