add timeout to xhr

Author: AleksandrRogov

lib/requests/xhr.js

@@ -65,6 +65,10 @@ var xhrRequest = function (options) {
         }
     };
 
+    if (options.timeout) {
+        request.timeout = options.timeout;
+    }
+
     request.onerror = function () {
         errorCallback({
             status: request.status,

lib/utilities/Utility.js

@@ -1,4 +1,4 @@
-function isNull (value) {
+function isNull(value) {
     return typeof value === "undefined" || typeof value === "unknown" || value == null;
 }
 
@@ -37,16 +37,12 @@ function getXrmContext() {
 function getClientUrl() {
     var context = getXrmContext();
 
-    if (context) {
-        var clientUrl = context.getClientUrl();
+    var clientUrl = context.getClientUrl();
 
-        if (clientUrl.match(/\/$/)) {
-            clientUrl = clientUrl.substring(0, clientUrl.length - 1);
-        }
-        return clientUrl;
+    if (clientUrl.match(/\/$/)) {
+        clientUrl = clientUrl.substring(0, clientUrl.length - 1);
     }
-
-    return '';
+    return clientUrl;
 }
 
 function initWebApiUrl(version) {

tests/common-tests.js

@@ -142,15 +142,57 @@ describe("Utility.", function () {
         });
     });
 
+    describe("getXrmContext - Xrm.Page is null", function () {
+        before(function () {
+            global.Xrm.Page = undefined;
+        });
+
+        after(function () {
+            global.Xrm.Page = {
+                context: {
+                    getClientUrl: function () {
+                        return "http://testorg.crm.dynamics.com";
+                    }
+                }
+            };
+        });
+
+        it("throws an error", function () {
+            expect(function () {
+                Utility.getXrmContext();
+            }).to.throw();
+        });
+    });
+
+    describe("getXrmContext - Xrm.Page.context is null", function () {
+        before(function () {
+            global.Xrm.Page.context = null;
+        });
+
+        after(function () {
+            global.Xrm.Page.context = {
+                getClientUrl: function () {
+                    return "http://testorg.crm.dynamics.com";
+                }
+            };
+        });
+
+        it("returns a correct string", function () {
+            expect(function () {
+                Utility.getXrmContext();
+            }).to.throw();
+        });
+    });
+
     describe("getClientUrl - removes a slash at the end", function () {
         before(function () {
-            Xrm.Page.context.getClientUrl = function () {
+            global.Xrm.Page.context.getClientUrl = function () {
                 return "http://testorg.crm.dynamics.com/";
             };
         });
 
         after(function () {
-            Xrm.Page.context.getClientUrl = function () {
+            global.Xrm.Page.context.getClientUrl = function () {
                 return "http://testorg.crm.dynamics.com";
             };
         });
@@ -161,6 +203,31 @@ describe("Utility.", function () {
             expect(result).to.be.eq("http://testorg.crm.dynamics.com");
         });
     });
+
+    describe("getXrmInternal", function () {
+        before(function () {
+            global.Xrm.Internal = "internal";
+        });
+
+        after(function () {
+            global.Xrm.Internal = undefined;
+
+        });
+
+        it("returns a correct string", function () {
+            var result = Utility.getXrmInternal();
+
+            expect(result).to.be.eq("internal");
+        });
+    });
+
+    describe("getXrmInternal - returns null if does not exist", function () {
+        it("returns a correct string", function () {
+            var result = Utility.getXrmInternal();
+
+            expect(result).to.be.undefined;
+        });
+    });
 });
 
 describe("RequestConverter.convertRequestOptions -", function () {

tests/xhr-tests.js

@@ -259,7 +259,7 @@ describe("xhr -", function() {
                 id: mocks.data.testEntityId,
                 collection: "tests",
                 entity: mocks.data.testEntity
-            }
+            };
 
             var responseObject;
             var responseObject2;
@@ -748,7 +748,7 @@ describe("xhr -", function() {
         });
     });
 
-    describe("xhr - request error", function () {
+    describe("request error", function () {
         var responseObject;
         before(function (done) {
             global.XMLHttpRequest = sinon.useFakeXMLHttpRequest();
@@ -795,7 +795,7 @@ describe("xhr -", function() {
         });
     });
 
-    describe("xhr - request timeout", function () {
+    describe("request timeout", function () {
         var responseObject;
         before(function (done) {
             global.XMLHttpRequest = sinon.useFakeXMLHttpRequest();
@@ -805,7 +805,9 @@ describe("xhr -", function() {
                 requests.push(xhr);
             };
 
-            dynamicsWebApiTest.create(mocks.data.testEntity, "tests").then(function (object) {
+            var dynamicsWebApiTimeout = new DynamicsWebApi({ webApiVersion: "8.2", timeout: 100 });
+
+            dynamicsWebApiTimeout.create(mocks.data.testEntity, "tests").then(function (object) {
                 responseObject = object;
                 done();
             }).catch(function (object) {