Merge pull request #4 from elliotchi/patch-1

Changes Promise.run to run in order placed in queue
taylorhakes · May 15, 2017 · cea0843 · cea0843
2 parents a82147a + e493d4c
commit cea0843
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -29,7 +29,7 @@ PromiseMock.run = function run(count) {
 	}
 
 	while(runTimes > 0 && PromiseMock.waiting.length > 0) {
-		PromiseMock.waiting.pop()();
+		PromiseMock.waiting.shift()();
 		runTimes--;
 	}
 };

diff --git a/tests/index.spec.js b/tests/index.spec.js
@@ -75,7 +75,7 @@ describe('Promise mock', function() {
 			Promise.reject().catch(function() {
 				done = true;
 			});
-			Promise.run();
+			Promise.run(2);
 			expect(done).toBe(true);
 		});
 		it('multiple runs', function() {
@@ -95,7 +95,7 @@ describe('Promise mock', function() {
 			}).catch(function() {
 				done = true;
 			});
-			Promise.run();
+			Promise.run(2);
 			expect(done).toBe(false);
 			Promise.run();
 			expect(done).toBe(true);
@@ -106,7 +106,7 @@ describe('Promise mock', function() {
 			}).then(function() {
 				done = true;
 			});
-			Promise.run();
+			Promise.run(2);
 			expect(done).toBe(false);
 			Promise.run();
 			expect(done).toBe(true);
@@ -119,7 +119,7 @@ describe('Promise mock', function() {
 			}).then(function() {
 				done = false;
 			});
-			Promise.run();
+			Promise.run(2);
 			expect(done).toBe(false);
 			Promise.run();
 			expect(done).toBe(true);