unit testing gone wild! url.query & url.search are problamatic

ahmadnassri · ahmadnassri · commit cd5cc0cc6211 · 2015-03-01T02:11:01.000-05:00
diff --git a/src/index.js b/src/index.js
@@ -2,6 +2,7 @@
 
 var debug = require('debug')('httpsnippet');
 var mapper = require('./mapper');
+var qs = require('querystring');
 var targets = require('./targets');
 var url = require('url');
 var util = require('util');
@@ -35,24 +36,24 @@ var HTTPSnippet = function (req, lang) {
   // deconstruct the uri
   this.source.uriObj = url.parse(this.source.url, true, true);
 
-  // search property is evil
-  // prevents re-construction with new query values
-  this.source.uriObj.search = null;
-
   // merge all possible queryString values
   this.source.queryString = util._extend(this.source.uriObj.query, this.source.queryObj);
 
-  // update the query object
-  this.source.uriObj.query = this.source.queryString;
-
-  // construct a full url
-  this.source.fullUrl = url.format(this.source.uriObj);
-
-  // reset queryString in url
+  // reset uriObj values for a clean url
   this.source.uriObj.query = null;
+  this.source.uriObj.search = null;
+  this.source.uriObj.path = this.source.uriObj.pathname;
 
   // keep the base url clean of queryString
   this.source.url = url.format(this.source.uriObj);
+
+  // update the uri object
+  this.source.uriObj.query = this.source.queryString;
+  this.source.uriObj.search = qs.stringify(this.source.queryString);
+  this.source.uriObj.path = this.source.uriObj.pathname + '?' + this.source.uriObj.search;
+
+  // construct a full url
+  this.source.fullUrl = url.format(this.source.uriObj);
 };
 
 HTTPSnippet.prototype.getSource = function () {
diff --git a/test/index.js b/test/index.js
@@ -24,12 +24,14 @@ describe('HTTPSnippet', function () {
       host: 'httpconsole.com',
       hostname: 'httpconsole.com',
       href: 'http://httpconsole.com/debug',
-      path: '/debug',
+      path: '/debug?foo=bar',
       pathname: '/debug',
       port: null,
       protocol: 'http:',
-      query: null,
-      search: null,
+      query: {
+        foo: 'bar'
+      },
+      search: 'foo=bar',
       slashes: true
     });
 
@@ -76,6 +78,15 @@ describe('HTTPSnippet', function () {
     done();
   });
 
+  it('should fix "path" property of "uriObj" to match queryString', function (done) {
+    var req = new HTTPSnippet(fixtures.query).getSource();
+
+    req.uriObj.path.should.be.a.String;
+    req.uriObj.path.should.eql('/debug?key=value&baz=abc&foo=bar&foo=baz');
+
+    done();
+  });
+
   it('should parse and queryString in the url into querString object', function (done) {
     var req = new HTTPSnippet(fixtures.query).getSource();
 
