refactor: Remove bluebird from test/unit/lib/classes

serverless · Mar 3, 2021 · 60f4a4a · 60f4a4a
1 parent ccba70a
commit 60f4a4a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 108 deletions.
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/PluginManager.test.js
@@ -18,7 +18,6 @@ const fse = require('fs-extra');
 const mockRequire = require('mock-require');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
-const BbPromise = require('bluebird');
 const getCacheFilePath = require('../../../../lib/utils/getCacheFilePath');
 const { installPlugin } = require('../../../utils/plugins');
 const { getTmpDirPath } = require('../../../utils/fs');
@@ -133,18 +132,12 @@ describe('PluginManager', () => {
       this.deployedResources = 0;
     }
 
-    functions() {
-      return new BbPromise((resolve) => {
-        this.deployedFunctions += 1;
-        return resolve();
-      });
+    async functions() {
+      this.deployedFunctions += 1;
     }
 
-    resources() {
-      return new BbPromise((resolve) => {
-        this.deployedResources += 1;
-        return resolve();
-      });
+    async resources() {
+      this.deployedResources += 1;
     }
   }
 
@@ -463,7 +456,7 @@ describe('PluginManager', () => {
     let getCommandsStub;
 
     beforeEach(() => {
-      writeFileStub = sinon.stub().returns(BbPromise.resolve());
+      writeFileStub = sinon.stub().returns(Promise.resolve());
       PluginManager = proxyquire('../../../../lib/classes/PluginManager.js', {
         '../utils/fs/writeFile': writeFileStub,
         'ncjsm/resolve/sync': resolveStub,
@@ -642,7 +635,7 @@ describe('PluginManager', () => {
   describe('#asyncPluginInit()', () => {
     it('should call async init on plugins that have it', () => {
       const plugin1 = new ServicePluginMock1();
-      plugin1.asyncInit = sinon.stub().returns(BbPromise.resolve());
+      plugin1.asyncInit = sinon.stub().returns(Promise.resolve());
       pluginManager.plugins = [plugin1];
       return pluginManager.asyncPluginInit().then(() => {
         expect(plugin1.asyncInit.calledOnce).to.equal(true);

diff --git a/test/unit/lib/classes/PromiseTracker.test.js b/test/unit/lib/classes/PromiseTracker.test.js
@@ -2,7 +2,7 @@
 
 /* eslint-disable no-unused-expressions */
 
-const BbPromise = require('bluebird');
+const wait = require('timers-ext/promise/sleep');
 const chai = require('chai');
 
 const PromiseTracker = require('../../../../lib/classes/PromiseTracker');
@@ -23,8 +23,8 @@ describe('PromiseTracker', () => {
     promiseTracker = new PromiseTracker();
   });
   it('logs a warning without throwing', () => {
-    promiseTracker.add('foo', BbPromise.resolve(), '${foo:}');
-    promiseTracker.add('foo', BbPromise.delay(10), '${foo:}');
+    promiseTracker.add('foo', Promise.resolve(), '${foo:}');
+    promiseTracker.add('foo', Promise.delay(10), '${foo:}');
     promiseTracker.report(); // shouldn't throw
     return Promise.all(promiseTracker.getAll());
   });
@@ -37,17 +37,17 @@ describe('PromiseTracker', () => {
   });
   it('reports the correct number of added promise statuses', () => {
     let resolve;
-    const pending = new BbPromise((rslv) => {
+    const pending = new Promise((rslv) => {
       resolve = rslv;
     });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
+    const resolved = Promise.resolve();
+    const rejected = Promise.reject('reason');
     promiseTracker.add('pending', pending, '${pending:}');
     promiseTracker.add('resolved', resolved, '${resolved:}');
     promiseTracker.add('rejected', rejected, '${rejected:}');
     resolved.state = 'resolved';
     rejected.state = 'rejected';
-    return BbPromise.delay(1)
+    return wait(1)
       .then(() => {
         const pendings = promiseTracker.getPending();
         expect(pendings).to.be.an.instanceof(Array);
@@ -73,18 +73,18 @@ describe('PromiseTracker', () => {
   });
   it('reports and then clears tracked promises when stopped after reporting.', () => {
     let resolve;
-    const pending = new BbPromise((rslv) => {
+    const pending = new Promise((rslv) => {
       resolve = rslv;
     });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
+    const resolved = Promise.resolve();
+    const rejected = Promise.reject('reason');
     promiseTracker.add('pending', pending, '${pending:}');
     promiseTracker.add('resolved', resolved, '${resolved:}');
     promiseTracker.add('rejected', rejected, '${rejected:}');
     resolved.state = 'resolved';
     rejected.state = 'rejected';
     promiseTracker.reported = true;
-    return BbPromise.delay(1).then(() => {
+    return wait(1).then(() => {
       const all = promiseTracker.getAll();
       expect(all).to.be.an.instanceof(Array);
       expect(all.length).to.equal(3);