fix: use properly encodeURI and encodeURIComponent

troch · Nov 1, 2016 · 1270364 · 1270364
1 parent 2f445e7
commit 1270364
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/Path.js b/modules/Path.js
@@ -174,8 +174,9 @@ export default class Path {
             .map(t => t.val[0]);
     }
 
-    _isSpatParam(name) {
-        return this.spatParams.indexOf(name) !== -1;
+    _isQueryParam(name) {
+        return this.queryParams.indexOf(name) !== -1 ||
+            this.queryParamsBr.indexOf(name) !== -1;
     }
 
     _urlTest(path, regex) {
@@ -243,7 +244,7 @@ export default class Path {
                 }
 
                 const val = params[key];
-                const encode = this._isSpatParam(key) ? encodeURI : encodeURIComponent;
+                const encode = this._isQueryParam(key) ? encodeURIComponent : encodeURI;
 
                 if (typeof val === 'boolean') {
                     acc[key] = val;

diff --git a/test/main.js b/test/main.js
@@ -196,5 +196,8 @@ describe('Path', function () {
 
         path.partialTest('/test/he:re/test2').should.eql({ name: 'he:re' });
         path.partialTest('/test/he\'re/test2').should.eql({ name: 'he\'re' });
+
+        path.build({ name: 'he:re' }).should.eql('/test/he:re/test2');
+        path.build({ name: 'he\'re' }).should.eql('/test/he\'re/test2');
     });
 });