Merge pull request #84 from RobotlegsJS/upgrade-dependencies

Update dependencies to latest version 🚀 (closes #83)

Author: tiagoschenkel

package.json

@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.24",
-    "@types/chai": "^4.1.4",
+    "@types/chai": "^4.1.5",
     "@types/mocha": "^5.2.5",
     "@types/sinon": "^5.0.2",
     "bluebird": "^3.5.2",
@@ -96,22 +96,22 @@
     "karma-webpack": "^3.0.5",
     "mocha": "^5.2.0",
     "nyc": "^13.0.1",
-    "prettier": "^1.14.2",
+    "prettier": "^1.14.3",
     "publish-please": "^3.2.0",
     "reflect-metadata": "^0.1.12",
     "remap-istanbul": "^0.12.0",
     "rimraf": "^2.6.2",
-    "sinon": "^6.3.3",
+    "sinon": "^6.3.4",
     "sinon-chai": "^3.2.0",
     "source-map-support": "^0.5.9",
-    "ts-loader": "^5.1.1",
+    "ts-loader": "^5.2.0",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "^3.0.3",
-    "uglifyjs-webpack-plugin": "^2.0.0",
-    "webpack": "^4.19.0",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-server": "^3.1.8"
+    "uglifyjs-webpack-plugin": "^2.0.1",
+    "webpack": "^4.20.1",
+    "webpack-cli": "^3.1.1",
+    "webpack-dev-server": "^3.1.9"
   }
 }

test/org/osflash/signals/PriorityListenersTest.test.ts

@@ -11,11 +11,14 @@ import { assert } from "chai";
 
 import { AsyncUtil } from "../../../util/AsyncUtil";
 import { DeluxeSignal } from "../../../../src/org/osflash/signals/DeluxeSignal";
+
 describe("PriorityListenersTest", () => {
     let async: AsyncUtil = new AsyncUtil();
 
     let completed: DeluxeSignal;
+    let listenersToCall: number;
     let listenersCalled: any[];
+    let callback: Function;
 
     beforeEach(() => {
         completed = new DeluxeSignal(this);
@@ -26,34 +29,61 @@ describe("PriorityListenersTest", () => {
         completed.removeAll();
         completed = null;
         listenersCalled = null;
-    });
-
-    it("listener_added_second_with_higher_priority_should_be_called_first()", done => {
-        completed.addWithPriority(async.add(listener1, 5));
-        completed.addWithPriority(async.add(listener0, 5, done), 10);
-
-        completed.dispatch();
+        callback = null;
     });
 
     function listener0(): void {
         listenersCalled.push(listener0);
         assert.equal(listener0, listenersCalled[0], "this should be the first listener called");
+        checkCallback();
     }
 
     function listener1(): void {
         listenersCalled.push(listener1);
         assert.equal(listener1, listenersCalled[1], "this should be the second listener called");
+        checkCallback();
     }
 
     function listener2(): void {
         listenersCalled.push(listener2);
         assert.equal(listener2, listenersCalled[2], "this should be the third listener called");
+        checkCallback();
+    }
+
+    function checkCallback(): void {
+        if (listenersCalled.length >= listenersToCall) {
+            callback();
+        }
     }
 
+    it("listener_added_second_with_higher_priority_should_be_called_first()", done => {
+        listenersToCall = 2;
+        callback = done;
+
+        completed.addWithPriority(async.add(listener1, 5));
+        completed.addWithPriority(async.add(listener0, 5), 10);
+
+        completed.dispatch();
+    });
+
     it("listeners_added_with_same_priority_should_be_called_in_order_added()", done => {
+        listenersToCall = 3;
+        callback = done;
+
         completed.addWithPriority(async.add(listener0, 5), 10);
         completed.addWithPriority(async.add(listener1, 5), 10);
-        completed.addWithPriority(async.add(listener2, 5, done), 10);
+        completed.addWithPriority(async.add(listener2, 5), 10);
+
+        completed.dispatch();
+    });
+
+    it("listeners_with_high_priority_should_be_called_first", done => {
+        listenersToCall = 3;
+        callback = done;
+
+        completed.addWithPriority(async.add(listener2, 5), 0);
+        completed.addWithPriority(async.add(listener1, 5), 5);
+        completed.addWithPriority(async.add(listener0, 5), 10);
 
         completed.dispatch();
     });