fix: Mike's Review

IBM-Swift · Nov 8, 2017 · 134ebd1 · 134ebd1
1 parent e2b541f
commit 134ebd1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/app/index.js b/app/index.js
@@ -61,20 +61,20 @@ module.exports = Generator.extend({
     })
   },
 
-  _isTrue: function (value) {
-    return (value === true || value === 'true')
-  },
-
   initializing: {
     ensureNotInProject: actions.ensureNotInProject,
 
     initSpec: function () {
+      function isTrue (value) {
+        return (value === true || value === 'true')
+      }
+
       if (this.options.bluemix) {
         this.skipPrompting = true
 
         var appName = this.options.bluemix.name
-        var metrics = this._isTrue(this.options.metrics) || undefined
-        var docker = this._isTrue(this.options.docker) || undefined
+        var metrics = isTrue(this.options.metrics) || undefined
+        var docker = isTrue(this.options.docker) || undefined
 
         var web = (this.appType === 'web' || this.appType === 'bff' || undefined)
         var hostSwagger = (this.appType === 'bff' || undefined)
@@ -532,7 +532,7 @@ module.exports = Generator.extend({
         // NOTE(tunniclm): no need to do anything for memory it is the default
         // if no crudservice is passed to the refresh generator
         if (answer.store === 'Cloudant') {
-          this._addService('cloudant', 'crudDataStore', true)
+          this._addService('cloudant', 'crudDataStore')
           this.crudservice = 'crudDataStore'
         }
       })
@@ -651,8 +651,6 @@ module.exports = Generator.extend({
       })
     },
 
-    // TODO: and so on (be careful about whether each service is a
-    // 1-element array or just stored directly)
     promptConfigureRedis: function () {
       if (this.skipPrompting) return
       if (!this.servicesToConfigure) return
@@ -783,6 +781,8 @@ module.exports = Generator.extend({
       if (this.skipPrompting) return
       if (!this.servicesToConfigure) return
       if (!this.servicesToConfigure.conversation) return
+
+      this.log()
       this.log('Configure Watson Conversation')
       var prompts = [
         { name: 'watsonConversationName', message: 'Enter name (blank for default):' },

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -578,10 +578,7 @@ exports.resourceNameFromPath = function (thepath) {
 }
 
 exports.isThisServiceAnArray = function (serviceType) {
-  if (serviceType === 'cloudant' || serviceType === 'objectStorage') {
-    return true
-  }
-  return false
+  return (serviceType === 'cloudant' || serviceType === 'objectStorage')
 }
 
 exports.validateServiceFields = function (serviceType, service) {

diff --git a/test/unit/app.js b/test/unit/app.js
@@ -1270,7 +1270,7 @@ describe('Unit tests for swiftserver:app', function () {
           appType: 'scaffold',
           appName: applicationName,
           capabilities: [],
-          services: { objectStorage: {} }
+          services: { objectStorage: [{ serviceInfo: {label: 'Object-Storage'} }] }
         }))
       })
 
@@ -1420,7 +1420,7 @@ describe('Unit tests for swiftserver:app', function () {
           appType: 'scaffold',
           appName: applicationName,
           capabilities: [],
-          services: { conversation: {} }
+          services: { conversation: { serviceInfo: {label: 'conversation'} } }
         }))
       })
 
@@ -1494,7 +1494,7 @@ describe('Unit tests for swiftserver:app', function () {
           appType: 'scaffold',
           appName: applicationName,
           capabilities: [],
-          services: { alertNotification: {} }
+          services: { alertNotification: { serviceInfo: {label: 'AlertNotification'} } }
         }))
       })
 

diff --git a/test/unit/refresh.js b/test/unit/refresh.js
@@ -141,7 +141,7 @@ describe('Unit tests for swiftserver:refresh', function () {
                                 appName: 'myapp',
                                 bluemix: {
                                   backendPlatform: 'SWIFT',
-                                  objectStorage: [{ serviceInfo: {} }]
+                                  objectStorage: [{ serviceInfo: {label: 'Object-Storage'} }]
                                 }
                               }
                             })
@@ -361,7 +361,6 @@ describe('Unit tests for swiftserver:refresh', function () {
           models: [ todoModel ],
           docker: true,
           bluemix: {
-            // TODO change this to serviceInfo format!
             backendPlatform: 'SWIFT',
             auth: { serviceInfo: { name: 'myAppIDService' } },
             cloudant: [{ serviceInfo: { name: 'myCloudantService' } }],