Update recently added tests

This commit is contained in:
Philipp Muens 2017-03-23 12:40:49 +01:00
parent 8d348da0ce
commit bd2b8d3679
5 changed files with 18 additions and 25 deletions

View File

@ -192,7 +192,7 @@ describe('Serverless', () => {
serverless.processedInput = { commands: [], options: {} };
// setup default stubs
logStatStub = sinon
.stub(serverless.utils, 'logStat').returns(BbPromise.resolve());
.stub(serverless.utils, 'logStat').resolves();
displayHelpStub = sinon
.stub(serverless.cli, 'displayHelp').returns(false);
validateCommandStub = sinon
@ -200,7 +200,7 @@ describe('Serverless', () => {
populateServiceStub = sinon
.stub(serverless.variables, 'populateService').returns();
runStub = sinon
.stub(serverless.pluginManager, 'run').returns(BbPromise.resolve());
.stub(serverless.pluginManager, 'run').resolves();
});
afterEach(() => {

View File

@ -98,8 +98,8 @@ describe('createStack', () => {
awsDeploy.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';
const createStackStub = sinon
.stub(awsDeploy.provider, 'request').returns(BbPromise.resolve());
sinon.stub(awsDeploy, 'monitorStack').returns(BbPromise.resolve());
.stub(awsDeploy.provider, 'request').resolves();
sinon.stub(awsDeploy, 'monitorStack').resolves();
return awsDeploy.create().then(() => {
expect(createStackStub.args[0][2].RoleARN)

View File

@ -2,7 +2,6 @@
const expect = require('chai').expect;
const sinon = require('sinon');
const BbPromise = require('bluebird');
const Serverless = require('../../../Serverless');
const AwsProvider = require('../provider/awsProvider');
const CLI = require('../../../classes/CLI');

View File

@ -2,7 +2,6 @@
const expect = require('chai').expect;
const sinon = require('sinon');
const BbPromise = require('bluebird');
const path = require('path');
const AwsProvider = require('../provider/awsProvider');
const AwsDeploy = require('../deploy');

View File

@ -21,28 +21,23 @@ describe('removeStack', () => {
};
awsRemove = new AwsRemove(serverless, options);
awsRemove.serverless.cli = new serverless.classes.CLI();
removeStackStub = sinon.stub(awsRemove.provider, 'request').returns(BbPromise.resolve());
removeStackStub = sinon.stub(awsRemove.provider, 'request').resolves();
});
describe('#remove()', () => {
it('should remove a stack', () => {
const removeStackStub = sinon
.stub(awsRemove.provider, 'request').resolves();
return awsRemove.remove().then(() => {
expect(removeStackStub.calledOnce).to.be.equal(true);
expect(removeStackStub.calledWithExactly(
'CloudFormation',
'deleteStack',
{
StackName: `${serverless.service.service}-${awsRemove.options.stage}`,
},
awsRemove.options.stage,
awsRemove.options.region
)).to.be.equal(true);
awsRemove.provider.request.restore();
})
);
it('should remove a stack', () => awsRemove.remove().then(() => {
expect(removeStackStub.calledOnce).to.be.equal(true);
expect(removeStackStub.calledWithExactly(
'CloudFormation',
'deleteStack',
{
StackName: `${serverless.service.service}-${awsRemove.options.stage}`,
},
awsRemove.options.stage,
awsRemove.options.region
)).to.be.equal(true);
awsRemove.provider.request.restore();
}));
it('should use CloudFormation service role if it is specified', () => {
awsRemove.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';