Merge pull request Kong#14 from thibaultCha/fix/tests

Fix: objc/native tests + enhancements

Author: ahmadnassri

src/targets/objc/native.js

@@ -1,6 +1,12 @@
 'use strict';
 
+var util = require('util');
+
 module.exports = function (options) {
+  var opts = util._extend({
+    timeout: '10'
+  }, options);
+
   var code = [];
 
   // Dependencies
@@ -11,7 +17,7 @@ module.exports = function (options) {
   // Create request object
   code.push('NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"' + this.source.fullUrl + '"]');
   code.push('                                                       cachePolicy:NSURLRequestUseProtocolCachePolicy');
-  code.push('                                                   timeoutInterval:10.0];');
+  code.push('                                                   timeoutInterval:' + parseInt(opts.timeout, 10).toFixed(1) + '];');
   code.push('[request setHTTPMethod:@"' + this.source.method + '"];');
 
   // Set headers
@@ -28,7 +34,7 @@ module.exports = function (options) {
   }
 
   // Set request body
-  if (this.source.postData && this.source.postData.params || this.source.postData.text) {
+  if (this.source.postData && (this.source.postData.params || this.source.postData.text)) {
     code.push(null);
 
     if (this.source.postData.mimeType === 'application/x-www-form-urlencoded' && this.source.postData.params) {

test/fixtures/output/curl/application-form-encoded.sh

@@ -1,4 +1,5 @@
 curl --request POST \
   --url "http://mockbin.com/har" \
   --header "Content-Type: application/x-www-form-urlencoded" \
-  --form "foo=bar"
+  --form "foo=bar" \
+  --form "hello=world"

test/fixtures/output/curl/http1.sh

@@ -0,0 +1,3 @@
+curl --request GET \
+  --url "http://mockbin.com/request" \
+  --http1.0

test/fixtures/output/httpie/application-form-encoded.sh

@@ -1,3 +1,4 @@
 http POST http://mockbin.com/har \
   Content-Type:application/x-www-form-urlencoded \
-  foo:bar
+  foo:bar \
+  hello:world

test/fixtures/output/httpie/http1.sh

@@ -0,0 +1 @@
+http GET http://mockbin.com/request

test/fixtures/output/node/native/application-form-encoded.js

@@ -23,6 +23,6 @@ var req = http.request(options, function (res) {
   });
 });
 
-var postData = querystring.stringify({"foo":"bar"});
+var postData = querystring.stringify({"foo":"bar","hello":"world"});
 req.write(postData);
 req.end();

test/fixtures/output/node/native/http1.js

@@ -0,0 +1,23 @@
+var http = require("http");
+
+var options = {
+  "method": "GET",
+  "hostname": "mockbin.com",
+  "port": null,
+  "path": "/request?",
+  "headers": {}
+};
+
+var req = http.request(options, function (res) {
+  var chunks = [];
+
+  res.on("data", function (chunk) {
+    chunks.push(chunk);
+  });
+
+  res.on("end", function () {
+    var body = Buffer.concat(chunks);
+  });
+});
+
+req.end();

test/fixtures/output/objc/native/application-form-encoded.m

@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+
+NSURLSession *session = [NSURLSession sharedSession];
+
+NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"]
+                                                       cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                                   timeoutInterval:10.0];
+[request setHTTPMethod:@"POST"];
+[request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
+
+NSMutableData *postData = [[NSMutableData alloc] initWithData:[@"foo=bar" dataUsingEncoding:NSUTF8StringEncoding]];
+[postData appendData:[@"&hello=world" dataUsingEncoding:NSUTF8StringEncoding]];
+[request setHTTPBody:postData];
+
+NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request
+                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+
+}];
+
+[dataTask resume];

test/fixtures/output/objc/native/application-json.m

@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+
+NSURLSession *session = [NSURLSession sharedSession];
+
+NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"]
+                                                       cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                                   timeoutInterval:10.0];
+[request setHTTPMethod:@"POST"];
+[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+
+NSData *postData = [[NSData alloc] initWithData:[@"{\"foo\": \"bar\"}" dataUsingEncoding:NSUTF8StringEncoding]];
+[request setHTTPBody:postData];
+
+NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request
+                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+
+}];
+
+[dataTask resume];

test/fixtures/output/objc/native/cookies.m

@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+
+NSURLSession *session = [NSURLSession sharedSession];
+
+NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"]
+                                                       cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                                   timeoutInterval:10.0];
+[request setHTTPMethod:@"POST"];
+[request setValue:@"foo=bar; bar=baz" forHTTPHeaderField:@"Cookie"];
+
+NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request
+                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+
+}];
+
+[dataTask resume];