Skip to content

Commit 23ed742

Browse files
author
Sergii Kovalev
committed
Merge remote-tracking branch 'source/master' into fix-per-function-role
# Conflicts: # test/updateAliasStack.test.js
2 parents a60dcd1 + b4c83c2 commit 23ed742

14 files changed

+3885
-3673
lines changed

‎package-lock.json

Lines changed: 3853 additions & 3642 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@
3737
"report-dir": "./coverage"
3838
},
3939
"dependencies": {
40-
"bluebird": "^3.5.1",
41-
"chalk": "^2.3.0",
42-
"lodash": "^4.17.4",
43-
"moment": "^2.21.0",
40+
"bluebird": "^3.5.4",
41+
"chalk": "^2.4.2",
42+
"lodash": "^4.17.11",
43+
"moment": "^2.24.0",
4444
"os": "^0.1.1",
45-
"semver": "^5.4.1"
45+
"semver": "^6.0.0"
4646
},
4747
"devDependencies": {
48-
"chai": "^4.1.2",
48+
"chai": "^4.2.0",
4949
"chai-as-promised": "^7.1.1",
5050
"chai-subset": "^1.6.0",
51-
"coveralls": "^3.0.0",
52-
"eslint": "^4.10.0",
53-
"eslint-plugin-import": "^2.8.0",
54-
"eslint-plugin-lodash": "^2.5.0",
55-
"eslint-plugin-promise": "^3.6.0",
51+
"coveralls": "^3.0.3",
52+
"eslint": "^5.16.0",
53+
"eslint-plugin-import": "^2.17.2",
54+
"eslint-plugin-lodash": "^5.1.0",
55+
"eslint-plugin-promise": "^4.1.1",
5656
"get-installed-path": "^4.0.8",
57-
"mocha": "^5.0.4",
58-
"nyc": "^11.2.1",
59-
"serverless": "^1.26.1",
60-
"sinon": "^4.0.2",
61-
"sinon-chai": "^2.14.0"
57+
"mocha": "^6.1.4",
58+
"nyc": "^14.0.0",
59+
"serverless": "^1.41.1",
60+
"sinon": "^7.3.2",
61+
"sinon-chai": "^3.3.0"
6262
}
6363
}

‎test/aliasRestructureStack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('aliasRestructureStack', () => {
2727
let logStub;
2828

2929
before(() => {
30-
sandbox = sinon.sandbox.create();
30+
sandbox = sinon.createSandbox();
3131
});
3232

3333
beforeEach(() => {

‎test/configureAliasStack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('configureAliasStack', () => {
2727
let logStub;
2828

2929
before(() => {
30-
sandbox = sinon.sandbox.create();
30+
sandbox = sinon.createSandbox();
3131
});
3232

3333
beforeEach(() => {

‎test/createAliasStack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('createAliasStack', () => {
2929
let logStub;
3030

3131
before(() => {
32-
sandbox = sinon.sandbox.create();
32+
sandbox = sinon.createSandbox();
3333
});
3434

3535
beforeEach(() => {

‎test/index.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('AwsAlias', () => {
2323
let sandbox;
2424

2525
before(() => {
26-
sandbox = sinon.sandbox.create();
26+
sandbox = sinon.createSandbox();
2727
});
2828

2929
beforeEach(() => {
@@ -111,7 +111,7 @@ describe('AwsAlias', () => {
111111
let apiLogsShowLogsStub;
112112

113113
before(() => {
114-
sandbox = sinon.sandbox.create();
114+
sandbox = sinon.createSandbox();
115115
awsAlias = new AwsAlias(serverless, options);
116116
});
117117

‎test/logs.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('logs', () => {
2727
let aliasStacksDescribeResourceStub;
2828

2929
before(() => {
30-
sandbox = sinon.sandbox.create();
30+
sandbox = sinon.createSandbox();
3131
});
3232

3333
beforeEach(() => {

‎test/removeAlias.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('removeAlias', () => {
3333
let aliasStack2;
3434

3535
before(() => {
36-
sandbox = sinon.sandbox.create();
36+
sandbox = sinon.createSandbox();
3737
});
3838

3939
beforeEach(() => {
@@ -196,7 +196,7 @@ describe('removeAlias', () => {
196196
});
197197

198198
it('should resolve if no updates are applied', () => {
199-
providerRequestStub.returns(BbPromise.reject(new Error('No updates are to be performed.')));
199+
providerRequestStub.rejects(new Error('No updates are to be performed.'));
200200
monitorStackStub.returns(BbPromise.resolve());
201201

202202
return expect(awsAlias.aliasApplyStackChanges(slsStack1, [ aliasStack2 ], aliasStack1)).to.be.fulfilled

‎test/stackops/apiGateway.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('API Gateway', () => {
2828
let logStub;
2929

3030
before(() => {
31-
sandbox = sinon.sandbox.create();
31+
sandbox = sinon.createSandbox();
3232
});
3333

3434
beforeEach(() => {
@@ -699,7 +699,7 @@ describe('API Gateway', () => {
699699
]));
700700

701701
});
702-
702+
703703
it('should support externally referenced custom authorizers with Pseudo Parameters', () => {
704704
stackTemplate = _.cloneDeep(require('../data/auth-stack-2.json'));
705705
const template = serverless.service.provider.compiledCloudFormationTemplate = stackTemplate;

‎test/stackops/init.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('SNS Events', () => {
2727
let logStub;
2828

2929
before(() => {
30-
sandbox = sinon.sandbox.create();
30+
sandbox = sinon.createSandbox();
3131
});
3232

3333
beforeEach(() => {

0 commit comments

Comments
 (0)