Skip to content

Commit 86ecc6d

Browse files
committed
[Kong#11][feature] Fixed bug with short and query
1 parent 7ef78f4 commit 86ecc6d

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎src/targets/node/request.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,15 @@ module.exports = function(options) {
6363
else {
6464
reqOpts.body = this.source.postData.params;
6565
}
66-
var simpleRequest = this.source.bodySize === 0 && this.source.headerSize === 0;
6766

67+
var simpleRequest =
68+
this.source.cookies.length === 0 &&
69+
this.source.headers.length === 0 && (
70+
!this.source.postData.params ||
71+
this.source.postData.params.length === 0
72+
);
73+
console.log(simpleRequest, this.source, simpleRequest)
74+
6875
// construct cookies argument
6976
var cookies = this.source.cookies.map(function(cookie) {
7077
return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value);
@@ -79,13 +86,14 @@ module.exports = function(options) {
7986
code.push('var fs = require(\'fs\');');
8087
}
8188

82-
code.push(null);
89+
if(!simpleRequest) code.push(null);
8390

8491
var options = !simpleRequest ? util.format('var options = %s;', JSON.stringify(reqOpts, null, opts.indent)) : null;
8592
fsReplace.forEach(function(fsToReplace) {
8693
options = options.replace('"' + fsToReplace + '"', fsToReplace);
8794
})
88-
code.push(options);
95+
96+
if(!simpleRequest) code.push(options);
8997

9098
code.push(null);
9199
var requestLine = 'request.';

‎test/fixtures/output/node/request/query.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
var request = require('request');
22

3-
var options = {
4-
"url": "http://mockbin.com/har?key=value&baz=abc&foo=bar&foo=baz",
5-
"headers": {}
6-
};
7-
8-
request.get(options, function(error, response, body){
3+
request.get('http://mockbin.com/har?key=value&baz=abc&foo=bar&foo=baz', function(error, response, body){
94
if(error) throw new Error(error);
105

116
});

‎test/fixtures/output/node/request/short.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
var request = require('request');
22

3-
var options = {
4-
"url": "http://mockbin.com/har",
5-
"headers": {}
6-
};
7-
8-
request.get(options, function(error, response, body){
3+
request.get('http://mockbin.com/har', function(error, response, body){
94
if(error) throw new Error(error);
105

116
});

0 commit comments

Comments
 (0)