fix: python prints proper utf8 string from bytes

ahmadnassri · ahmadnassri · commit 3eb687371f39 · 2015-03-18T21:42:29.000-07:00
fix: node prints proper utf8 string from buffer
add: actual request testing with natively supported languages (no libraries)
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/Mashape/httpsnippet/issues"
   },
   "scripts": {
-    "test": "standard && mocha --reporter spec",
+    "test": "standard && mocha --bail --no-timeouts --reporter spec",
     "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha",
     "prepush": "npm test"
   },
diff --git a/src/targets/node/native.js b/src/targets/node/native.js
@@ -27,7 +27,7 @@ module.exports = function (source, options) {
     headers: source.allHeaders
   }
 
-  code.push('var http = require("http");')
+  code.push(util.format('var http = require("%s");', source.uriObj.protocol.replace(':', '')))
 
   if (!source.postData.text && source.postData.params) {
     code.push('var querystring = require("querystring");')
@@ -53,7 +53,7 @@ module.exports = function (source, options) {
 
   code.push(opts.indent + 'res.on("end", function () {')
   code.push(opts.indent + opts.indent + 'var body = Buffer.concat(chunks);')
-  code.push(opts.indent + opts.indent + 'console.log(body);')
+  code.push(opts.indent + opts.indent + 'console.log(body.toString());')
   code.push(opts.indent + '});')
   code.push('});')
 
diff --git a/src/targets/python/python3.js b/src/targets/python/python3.js
@@ -70,8 +70,7 @@ module.exports = function (source, options) {
   // Get Response
   code.push('\nres = conn.getresponse()')
   code.push('data = res.read()')
-  code.push('\nprint(res.status)')
-  code.push('print(data)')
+  code.push('print(data.decode("utf-8"))')
 
   // console.log(code)
   return code.join('\n')
diff --git a/test/fixtures/cli.json b/test/fixtures/cli.json
@@ -0,0 +1,25 @@
+[
+  {
+    "run": "node %s",
+    "target":"node",
+    "clients": [
+      "native"
+    ]
+  },
+
+  {
+    "run": "php %s",
+    "target": "php",
+    "clients": [
+      "curl"
+    ]
+  },
+
+  {
+    "run": "python3 %s",
+    "target": "python",
+    "clients": [
+      "python3"
+    ]
+  }
+]
diff --git a/test/fixtures/output/node/native/application-form-encoded.js b/test/fixtures/output/node/native/application-form-encoded.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/application-json.js b/test/fixtures/output/node/native/application-json.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/cookies.js b/test/fixtures/output/node/native/cookies.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/custom-method.js b/test/fixtures/output/node/native/custom-method.js
@@ -17,7 +17,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/full.js b/test/fixtures/output/node/native/full.js
@@ -21,7 +21,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/headers.js b/test/fixtures/output/node/native/headers.js
@@ -20,7 +20,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/https.js b/test/fixtures/output/node/native/https.js
@@ -1,4 +1,4 @@
-var http = require("http");
+var http = require("https");
 
 var options = {
   "method": "GET",
@@ -17,7 +17,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/multipart-data.js b/test/fixtures/output/node/native/multipart-data.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/multipart-file.js b/test/fixtures/output/node/native/multipart-file.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/multipart-form-data.js b/test/fixtures/output/node/native/multipart-form-data.js
@@ -19,7 +19,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/query.js b/test/fixtures/output/node/native/query.js
@@ -17,7 +17,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/node/native/short.js b/test/fixtures/output/node/native/short.js
@@ -17,7 +17,7 @@ var req = http.request(options, function (res) {
 
   res.on("end", function () {
     var body = Buffer.concat(chunks);
-    console.log(body);
+    console.log(body.toString());
   });
 });
 
diff --git a/test/fixtures/output/python/python3/application-form-encoded.py b/test/fixtures/output/python/python3/application-form-encoded.py
@@ -10,6 +10,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/application-json.py b/test/fixtures/output/python/python3/application-json.py
@@ -10,6 +10,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/cookies.py b/test/fixtures/output/python/python3/cookies.py
@@ -8,6 +8,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/custom-method.py b/test/fixtures/output/python/python3/custom-method.py
@@ -6,6 +6,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/full.py b/test/fixtures/output/python/python3/full.py
@@ -14,6 +14,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/headers.py b/test/fixtures/output/python/python3/headers.py
@@ -11,6 +11,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/https.py b/test/fixtures/output/python/python3/https.py
@@ -6,6 +6,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/multipart-data.py b/test/fixtures/output/python/python3/multipart-data.py
@@ -10,6 +10,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/multipart-file.py b/test/fixtures/output/python/python3/multipart-file.py
@@ -10,6 +10,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/multipart-form-data.py b/test/fixtures/output/python/python3/multipart-form-data.py
@@ -10,6 +10,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/query.py b/test/fixtures/output/python/python3/query.py
@@ -6,6 +6,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/output/python/python3/short.py b/test/fixtures/output/python/python3/short.py
@@ -6,6 +6,4 @@
 
 res = conn.getresponse()
 data = res.read()
-
-print(res.status)
-print(data)
+print(data.decode("utf-8"))
diff --git a/test/fixtures/requests/application-form-encoded.json b/test/fixtures/requests/application-form-encoded.json
@@ -3,7 +3,7 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "application/x-www-form-urlencoded"
     }
   ],
diff --git a/test/fixtures/requests/application-json.json b/test/fixtures/requests/application-json.json
@@ -3,7 +3,7 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "application/json"
     }
   ],
diff --git a/test/fixtures/requests/full.json b/test/fixtures/requests/full.json
@@ -18,11 +18,11 @@
   ],
   "headers": [
     {
-      "name": "Accept",
+      "name": "accept",
       "value": "application/json"
     },
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "application/x-www-form-urlencoded"
     }
   ],
diff --git a/test/fixtures/requests/headers.json b/test/fixtures/requests/headers.json
@@ -3,11 +3,11 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Accept",
+      "name": "accept",
       "value": "application/json"
     },
     {
-      "name": "X-Foo",
+      "name": "x-foo",
       "value": "Bar"
     }
   ]
diff --git a/test/fixtures/requests/multipart-data.json b/test/fixtures/requests/multipart-data.json
@@ -3,7 +3,7 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "multipart/form-data"
     }
   ],
diff --git a/test/fixtures/requests/multipart-file.json b/test/fixtures/requests/multipart-file.json
@@ -3,7 +3,7 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "multipart/form-data"
     }
   ],
diff --git a/test/fixtures/requests/multipart-form-data.json b/test/fixtures/requests/multipart-form-data.json
@@ -3,7 +3,7 @@
   "url": "http://mockbin.com/har",
   "headers": [
     {
-      "name": "Content-Type",
+      "name": "content-type",
       "value": "multipart/form-data"
     }
   ],
diff --git a/test/requests.js b/test/requests.js
