Check for _aborted before _fire() (#38)

* Check for _aborted before _fire()
microsoft · Sep 21, 2018 · d2f6ea8 · d2f6ea8
1 parent e62c713
commit d2f6ea8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplerestclients",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A library of components for accessing RESTful services with javascript/typescript.",
   "author": "David de Regt <David.de.Regt@microsoft.com>",
   "scripts": {

diff --git a/src/SimpleWebRequest.ts b/src/SimpleWebRequest.ts
@@ -223,7 +223,7 @@ export abstract class SimpleWebRequestBase<TOptions extends WebRequestOptions =
             blockPromise.finally(() => {
                 _.remove(blockedList, req);
             }).then(() => {
-                if (executingList.length < SimpleWebRequestOptions.MaxSimultaneousRequests) {
+                if (executingList.length < SimpleWebRequestOptions.MaxSimultaneousRequests && !req._aborted) {
                     executingList.push(req);
                     req._fire();
                 } else {

diff --git a/test/SimpleWebRequest.spec.ts b/test/SimpleWebRequest.spec.ts
@@ -266,6 +266,19 @@ describe('SimpleWebRequest', () => {
 
             blockDefer.reject(errorString);
         });
+
+        it('does not attempt to fire aborted request, if it was aborted while blocked', () => {
+            SimpleWebRequestOptions.MaxSimultaneousRequests = 1;
+            const url = faker.internet.url();
+            const method = 'GET';
+            const blockDefer = SyncTasks.Defer<void>();
+            const requestPromise = new SimpleWebRequest<string>(url, method, { priority: WebRequestPriority.Critical }, undefined, () => blockDefer.promise()).start();
+            requestPromise.cancel();
+
+            blockDefer.resolve(void 0);
+            expect(jasmine.Ajax.requests.count()).toBe(0);
+
+        });
     });
 
     // @TODO Add more unit tests