feat: remove q-promise-utils

DudaGod · DudaGod · commit 67b36823fe09 · 2017-11-04T23:58:40.000+03:00
Use promiseUtils from gemini-core on bluebird instead q-promise-utils
diff --git a/lib/capture-session/index.js b/lib/capture-session/index.js
@@ -2,8 +2,9 @@
 
 const inherit = require('inherit');
 const _ = require('lodash');
+const Promise = require('bluebird');
 const debug = require('debug');
-const promiseUtil = require('q-promise-utils');
+
 const ActionsBuilder = require('../tests-api/actions-builder');
 const Browser = require('../browser');
 const temp = require('../temp');
@@ -25,7 +26,7 @@ var CaptureSession = inherit({
 
     runActions: function(actions) {
         this.log('run actions');
-        return promiseUtil.sequence(actions, this.browser, new ActionsBuilder(this._postActions));
+        return Promise.mapSeries(actions, (a) => a(this.browser, new ActionsBuilder(this._postActions)));
     },
 
     prepareScreenshot: function(state) {
@@ -45,7 +46,7 @@ var CaptureSession = inherit({
     },
 
     runPostActions: function() {
-        return promiseUtil.sequence(this._postActions.reverse(), this.browser);
+        return Promise.mapSeries(this._postActions.reverse(), (a) => a(this.browser));
     },
 
     extendWithPageScreenshot: function(obj) {
diff --git a/lib/runner/browser-runner/index.js b/lib/runner/browser-runner/index.js
@@ -3,8 +3,7 @@
 const _ = require('lodash');
 const url = require('url');
 const path = require('path');
-const promiseUtils = require('q-promise-utils');
-const BrowserAgent = require('gemini-core').BrowserAgent;
+const {BrowserAgent, promiseUtils} = require('gemini-core');
 const Runner = require('../runner');
 const SuiteRunner = require('../suite-runner');
 const Events = require('../../constants/events');
diff --git a/lib/runner/index.js b/lib/runner/index.js
@@ -1,8 +1,7 @@
 'use strict';
 
-const Promise = require('bluebird');
 const _ = require('lodash');
-const promiseUtils = require('q-promise-utils');
+const {promiseUtils} = require('gemini-core');
 
 const pool = require('../browser-pool');
 const BrowserRunner = require('./browser-runner');
@@ -37,7 +36,7 @@ module.exports = class TestsRunner extends Runner {
     }
 
     run(suiteCollection) {
-        return Promise.resolve(this.emitAndWait(Events.START_RUNNER, this))
+        return this.emitAndWait(Events.START_RUNNER, this)
             .then(() => this.emit(Events.BEGIN, this._formatBeginEventData(suiteCollection)))
             .then(() => this._stateProcessor.prepare(this))
             .then(() => !this._cancelled && this._runTests(suiteCollection))
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,6 @@
     "node-fetch": "^1.6.3",
     "plugins-loader": "^1.1.0",
     "png-img": "^2.1.0",
-    "q-promise-utils": "^1.1.0",
     "resolve": "^1.1.0",
     "sizzle": "^2.2.0",
     "source-map": "^0.5.3",
diff --git a/test/unit/capture-session/index.js b/test/unit/capture-session/index.js
