Merge pull request NativeScript#160 from NativeScript/http-timeout

Vladimir Enchev · Vladimir Enchev · commit 213b4e79fba6 · 2015-05-14T13:21:37.000+03:00
http timeout fixes + test
diff --git a/apps/tests/http-tests.ts b/apps/tests/http-tests.ts
@@ -160,6 +160,20 @@ export var test_request_shouldFailIfOptionsUrlIsNotDefined = function (done) {
     });
 };
 
+export var test_request_requestShouldTimeout = function (done) {
+    var result;
+    http.request({ url: "http://10.255.255.1", method: "GET", timeout: 500 }).catch(function (e) {
+        result = e;
+        try {
+            TKUnit.assert(result instanceof Error, "Result from request().fail() should be Error! Current type is " + typeof result);
+            done(null);
+        }
+        catch (err) {
+            done(err);
+        }
+    });
+};
+
 export var test_request_responseStatusCodeShouldBeDefined = function (done) {
     var result: http.HttpResponse;
 
diff --git a/http/http-request.ios.ts b/http/http-request.ios.ts
@@ -32,13 +32,13 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
                 }
             }
 
-            if (types.isNumber(options.timeout)) {
-                urlRequest.timeoutInterval = options.timeout * 1000;
-            }
-
             if (types.isString(options.content)) {
                 urlRequest.HTTPBody = NSString.alloc().initWithString(options.content).dataUsingEncoding(4);
             }
+            
+            if (types.isNumber(options.timeout)) {
+                urlRequest.timeoutInterval = options.timeout / 1000;
+            }
 
             var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
                 function (data: NSData, response: NSHTTPURLResponse, error: NSError) {
diff --git a/http/http.d.ts b/http/http.d.ts
@@ -72,7 +72,7 @@ declare module "http" {
         content?: string;
 
          /**
-          * Gets or sets the request timeout.
+          * Gets or sets the request timeout in milliseconds.
           */
         timeout?: number;
     }

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (types.isNumber(options.timeout)) {`
`36`		`- urlRequest.timeoutInterval = options.timeout * 1000;`
`37`		`- }`
`38`		`-`
`39`	`35`	`if (types.isString(options.content)) {`
`40`	`36`	`urlRequest.HTTPBody = NSString.alloc().initWithString(options.content).dataUsingEncoding(4);`
`41`	`37`	`}`
	`38`	`+`
	`39`	`+ if (types.isNumber(options.timeout)) {`
	`40`	`+ urlRequest.timeoutInterval = options.timeout / 1000;`
	`41`	`+ }`
`42`	`42`
`43`	`43`	`var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,`
`44`	`44`	`function (data: NSData, response: NSHTTPURLResponse, error: NSError) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ declare module "http" {`
`72`	`72`	`content?: string;`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * Gets or sets the request timeout.`
	`75`	`+ * Gets or sets the request timeout in milliseconds.`
`76`	`76`	`*/`
`77`	`77`	`timeout?: number;`
`78`	`78`	`}`