From 311d322b821934490335661e1a0eed699ddc2e52 Mon Sep 17 00:00:00 2001 From: horike37 Date: Wed, 12 Jul 2017 08:26:26 +0900 Subject: [PATCH 1/3] fixed unhandled rejection errors --- lib/classes/Utils.test.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/classes/Utils.test.js b/lib/classes/Utils.test.js index 6d0ab2d34..b0429021f 100644 --- a/lib/classes/Utils.test.js +++ b/lib/classes/Utils.test.js @@ -23,6 +23,9 @@ describe('Utils', () => { '../utils/isDockerContainer': isDockerContainerStub, }); serverless = new Serverless(); + serverless.service.package = { + path: 'foo', + }; utils = new Utils(serverless); serverless.init(); }); @@ -398,6 +401,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -436,6 +442,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; @@ -473,6 +482,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -511,6 +523,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -549,6 +564,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -585,6 +603,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -623,6 +644,9 @@ describe('Utils', () => { ], }, }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { @@ -646,6 +670,9 @@ describe('Utils', () => { provider: { name: 'google', }, + package: { + path: 'foo', + }, }; return utils.logStat(serverless).then(() => { From 10acadc09c8148efaef18878a6e5ce0694117d7c Mon Sep 17 00:00:00 2001 From: horike37 Date: Wed, 12 Jul 2017 08:29:42 +0900 Subject: [PATCH 2/3] remove unnecessary parts --- lib/classes/Utils.test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/classes/Utils.test.js b/lib/classes/Utils.test.js index b0429021f..8e3b4744c 100644 --- a/lib/classes/Utils.test.js +++ b/lib/classes/Utils.test.js @@ -23,9 +23,6 @@ describe('Utils', () => { '../utils/isDockerContainer': isDockerContainerStub, }); serverless = new Serverless(); - serverless.service.package = { - path: 'foo', - }; utils = new Utils(serverless); serverless.init(); }); From 172e12dfc51d969c96a6d7dca90a6384b8dc09a9 Mon Sep 17 00:00:00 2001 From: horike37 Date: Wed, 12 Jul 2017 08:47:59 +0900 Subject: [PATCH 3/3] update to use chai-as-promise instead of chai --- lib/classes/Utils.test.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/classes/Utils.test.js b/lib/classes/Utils.test.js index 8e3b4744c..f7b3ff583 100644 --- a/lib/classes/Utils.test.js +++ b/lib/classes/Utils.test.js @@ -2,7 +2,7 @@ const path = require('path'); const os = require('os'); -const expect = require('chai').expect; +const chai = require('chai'); const sinon = require('sinon'); const Serverless = require('../../lib/Serverless'); const testUtils = require('../../tests/utils'); @@ -10,6 +10,8 @@ const configUtils = require('../utils/config'); const serverlessVersion = require('../../package.json').version; const segment = require('../utils/segment'); const proxyquire = require('proxyquire'); +chai.use(require('chai-as-promised')); +const expect = require('chai').expect; describe('Utils', () => { let utils; @@ -83,7 +85,7 @@ describe('Utils', () => { serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' }); - return serverless.yamlParser.parse(tmpFilePath).then((obj) => { + return expect(serverless.yamlParser.parse(tmpFilePath)).to.be.fulfilled.then((obj) => { expect(obj.foo).to.equal('bar'); }); }); @@ -93,7 +95,7 @@ describe('Utils', () => { serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' }); - return serverless.yamlParser.parse(tmpFilePath).then((obj) => { + return expect(serverless.yamlParser.parse(tmpFilePath)).to.be.fulfilled.then((obj) => { expect(obj.foo).to.equal('bar'); }); }); @@ -108,7 +110,8 @@ describe('Utils', () => { const tmpFilePath = testUtils.getTmpFilePath('anything.json'); // note: use return when testing promises otherwise you'll have unhandled rejection errors - return serverless.utils.writeFile(tmpFilePath, { foo: 'bar' }).then(() => { + return expect(serverless.utils.writeFile(tmpFilePath, { foo: 'bar' })) + .to.be.fulfilled.then(() => { const obj = serverless.utils.readFileSync(tmpFilePath); expect(obj.foo).to.equal('bar'); @@ -178,7 +181,7 @@ describe('Utils', () => { serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' }); // note: use return when testing promises otherwise you'll have unhandled rejection errors - return serverless.utils.readFile(tmpFilePath).then((obj) => { + return expect(serverless.utils.readFile(tmpFilePath)).to.be.fulfilled.then((obj) => { expect(obj.foo).to.equal('bar'); }); }); @@ -349,7 +352,7 @@ describe('Utils', () => { // help is a whitelisted option serverless.processedInput.options = options; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(trackStub.calledOnce).to.equal(true); expect(getConfigStub.calledOnce).to.equal(true); @@ -365,7 +368,7 @@ describe('Utils', () => { frameworkId: '1234wasd', }); - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(isDockerContainerStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -403,7 +406,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -445,7 +448,7 @@ describe('Utils', () => { }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -484,7 +487,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -525,7 +528,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -566,7 +569,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -605,7 +608,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -646,7 +649,7 @@ describe('Utils', () => { }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -667,12 +670,9 @@ describe('Utils', () => { provider: { name: 'google', }, - package: { - path: 'foo', - }, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(getConfigStub.calledOnce).to.equal(true); expect(trackStub.calledOnce).to.equal(true); @@ -735,7 +735,7 @@ describe('Utils', () => { package: {}, }; - return utils.logStat(serverless).then(() => { + return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => { expect(trackStub.calledOnce).to.equal(true); expect(getConfigStub.calledOnce).to.equal(true);