add conditions for empty of activities

serverless-operations · Apr 17, 2017 · acaf689 · acaf689
1 parent 6c422c4
commit acaf689
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/lib/yamlParser.js b/lib/yamlParser.js
@@ -1,6 +1,7 @@
 'use strict';
 const BbPromise = require('bluebird');
 const path = require('path');
+const _ = require('lodash');
 
 module.exports = {
   yamlParse() {
@@ -21,7 +22,7 @@ module.exports = {
         this.serverless.service.stepFunctions.activities
           = serverlessFileParam.stepFunctions
           && serverlessFileParam.stepFunctions.activities
-          ? serverlessFileParam.stepFunctions.activities : {};
+          ? serverlessFileParam.stepFunctions.activities : [];
         this.serverless.variables.populateService(this.serverless.pluginManager.cliOptions);
         return BbPromise.resolve();
       });
@@ -49,8 +50,9 @@ module.exports = {
   },
 
   isStateMachines() {
-    if (this.serverless.service.stepFunctions
-      && this.serverless.service.stepFunctions.stateMachines) {
+    if (this.serverless.service.stepFunctions != null
+      && this.serverless.service.stepFunctions.stateMachines != null
+      && !_.isEmpty(this.serverless.service.stepFunctions.stateMachines)) {
       return true;
     }
     return false;
@@ -78,8 +80,9 @@ module.exports = {
   },
 
   isActivities() {
-    if (this.serverless.service.stepFunctions
-      && this.serverless.service.stepFunctions.activities) {
+    if (this.serverless.service.stepFunctions != null
+      && this.serverless.service.stepFunctions.activities != null
+      && !_.isEmpty(this.serverless.service.stepFunctions.activities)) {
       return true;
     }
     return false;

diff --git a/lib/yamlParser.test.js b/lib/yamlParser.test.js
@@ -70,7 +70,7 @@ describe('#yamlParse', () => {
         expect(yamlParserStub.calledOnce).to.be.equal(true);
         expect(populateServiceStub.calledOnce).to.be.equal(true);
         expect(serverless.service.stepFunctions.stateMachines).to.be.deep.equal({});
-        expect(serverless.service.stepFunctions.activities).to.be.deep.equal({});
+        expect(serverless.service.stepFunctions.activities).to.be.deep.equal([]);
         serverlessStepFunctions.serverless.yamlParser.parse.restore();
         serverlessStepFunctions.serverless.variables.populateService.restore();
       });
@@ -142,6 +142,13 @@ describe('#yamlParse', () => {
       serverless.service.stepFunctions = {};
       expect(serverlessStepFunctions.isStateMachines()).to.be.equal(false);
     });
+
+    it('should return false if the stameMachines is empty object', () => {
+      serverless.service.stepFunctions = {
+        stateMachines: {},
+      };
+      expect(serverlessStepFunctions.isStateMachines()).to.be.equal(false);
+    });
   });
 
   describe('#getAllActivities()', () => {
@@ -198,5 +205,12 @@ describe('#yamlParse', () => {
       serverless.service.stepFunctions = {};
       expect(serverlessStepFunctions.isActivities()).to.be.equal(false);
     });
+
+    it('should return false if the activities is empty array', () => {
+      serverless.service.stepFunctions = {
+        activities: [],
+      };
+      expect(serverlessStepFunctions.isActivities()).to.be.equal(false);
+    });
   });
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-step-functions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "The module is AWS Step Functions plugin for Serverless Framework",
   "main": "lib/index.js",
   "scripts": {