Merge 3f38206 into 006071b

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.42.1 (2019-05-09)
+- [Fix bug with `cors: true`](https://github.com/serverless/serverless/pull/6104)
+
 # 1.42.0 (2019-05-09)
 
 - [Update cors.md](https://github.com/serverless/serverless/pull/6027)

lib/plugins/aws/package/compile/events/apiGateway/index.js

@@ -74,8 +74,6 @@ class AwsCompileApigEvents {
       'after:deploy:deploy': () => {
         const updateStage = require('./lib/hack/updateStage').updateStage;
 
-        this.validated = this.validate();
-
         if (this.validated.events.length === 0) {
           return BbPromise.resolve();
         }

lib/plugins/aws/package/compile/events/apiGateway/index.test.js

@@ -116,12 +116,8 @@ describe('AwsCompileApigEvents', () => {
     });
 
     describe('when running the "after:deploy:deploy" promise chain', () => {
-      afterEach(() => {
-        awsCompileApigEvents.validate.restore();
-      });
-
       it('should run the promise chain in order', () => {
-        const validateStub = sinon.stub(awsCompileApigEvents, 'validate').returns({
+        awsCompileApigEvents.validated = {
           events: [
             {
               functionName: 'first',
@@ -131,21 +127,16 @@ describe('AwsCompileApigEvents', () => {
               },
             },
           ],
-        });
-
+        };
         awsCompileApigEvents.hooks['after:deploy:deploy']().then(() => {
-          expect(validateStub.calledOnce).to.equal(true);
-          expect(updateStageStub.calledAfter(validateStub)).to.equal(true);
+          expect(updateStageStub.calledOnce).to.equal(true);
         });
       });
 
       it('should skip the updateStage step when no http events are found', () => {
-        const validateStub = sinon.stub(awsCompileApigEvents, 'validate').returns({
-          events: [],
-        });
+        awsCompileApigEvents.validated = { events: [] };
 
         awsCompileApigEvents.hooks['after:deploy:deploy']().then(() => {
-          expect(validateStub.calledOnce).to.equal(true);
           expect(updateStageStub.calledOnce).to.equal(false);
         });
       });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "1.42.0",
+  "version": "1.42.1",
   "engines": {
     "node": ">=4.0"
   },