rebased, merged #280

swagger-api · Jun 3, 2015 · b6f5dbc · b6f5dbc
1 parent 74e24e5
commit b6f5dbc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 49 deletions.
diff --git a/browser/swagger-client.js b/browser/swagger-client.js
diff --git a/browser/swagger-client.min.js b/browser/swagger-client.min.js
@@ -3421,22 +3421,7 @@ Operation.prototype.encodeQueryParam = function (arg) {
  * TODO revisit, might not want to leave '/'
  **/
 Operation.prototype.encodePathParam = function (pathParam) {
-  var encParts, parts, i, len;
-
-  pathParam = pathParam.toString();
-
-  if (pathParam.indexOf('/') === -1) {
-    return encodeURIComponent(pathParam);
-  } else {
-    parts = pathParam.split('/');
-    encParts = [];
-
-    for (i = 0, len = parts.length; i < len; i++) {
-      encParts.push(encodeURIComponent(parts[i]));
-    }
-
-    return encParts.join('/');
-  }
+  return encodeURIComponent(pathParam);
 };
 
 },{"../helpers":4,"../http":5,"./model":8,"lodash-compat/lang/cloneDeep":126,"lodash-compat/lang/isUndefined":135}],10:[function(require,module,exports){

diff --git a/lib/types/operation.js b/lib/types/operation.js
@@ -888,20 +888,5 @@ Operation.prototype.encodeQueryParam = function (arg) {
  * TODO revisit, might not want to leave '/'
  **/
 Operation.prototype.encodePathParam = function (pathParam) {
-  var encParts, parts, i, len;
-
-  pathParam = pathParam.toString();
-
-  if (pathParam.indexOf('/') === -1) {
-    return encodeURIComponent(pathParam);
-  } else {
-    parts = pathParam.split('/');
-    encParts = [];
-
-    for (i = 0, len = parts.length; i < len; i++) {
-      encParts.push(encodeURIComponent(parts[i]));
-    }
-
-    return encParts.join('/');
-  }
+  return encodeURIComponent(pathParam);
 };
diff --git a/test/request.js b/test/request.js
@@ -321,4 +321,15 @@ describe('swagger request functions', function () {
       done();
     });
   });
+
+  it('escapes a param per #280', function () {
+    var petApi = sample.pet;
+    var req = petApi.getPetById({petId: 'foo/bar'}, {mock: true});
+
+    test.object(req);
+
+    expect(req.method).toBe('GET');
+    expect(req.headers.Accept).toBe('application/json');
+    expect(req.url).toBe('http://localhost:8000/v2/api/pet/foo%2Fbar');
+  });
 });