Fixed query-string support, retain original qs

ladjs · Jan 24, 2012 · b3abd64 · b3abd64
1 parent 32c6ac1
commit b3abd64
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -498,12 +498,16 @@ Request.prototype.request = function(){
   options.path = url.pathname;
   options.host = url.hostname;
 
+  if (null == url.query) url.query = '';
+
   // querystring
-  if ('GET' == this.method && null != data) {
-    options.path += '?' + qs.stringify(data);
-    data = null;
+  if ('GET' == this.method && data) {
+    data = qs.stringify(data);
+    url.query += (url.query.length ? '&' : '') + data;
   }
 
+  if (url.query.length) options.path += '?' + url.query;
+
   // initiate request
   var mod = exports.protocols[url.protocol];
 

diff --git a/test/node/query.js b/test/node/query.js
@@ -14,7 +14,7 @@ app.listen(3006);
 
 describe('req.send(Object)', function(){
   describe('on a GET request', function(){
-    it('should send x-www-form-urlencoded data', function(done){
+    it('should construct the query-string', function(done){
       request
       .get('http://localhost:3006/')
       .send({ name: 'tobi' })
@@ -25,5 +25,24 @@ describe('req.send(Object)', function(){
         done();
       });
     })
+
+    it('should append to the original query-string', function(done){
+      request
+      .get('http://localhost:3006/?name=tobi')
+      .send({ order: 'asc' })
+      .end(function(res) {
+        res.body.should.eql({ name: 'tobi', order: 'asc' });
+        done();
+      });
+    });
+
+    it('should retain the original query-string', function(done){
+      request
+      .get('http://localhost:3006/?name=tobi')
+      .end(function(res) {
+        res.body.should.eql({ name: 'tobi' });
+        done();
+      });
+    });
   })
-})
+})