Recent Activity -> Recent Activations

Fixes #854

Author: starpit

app/plugins/modules/activation-visualizations/lib/util.js

@@ -37,7 +37,7 @@ exports.rightArrowHeadEmpty = '\u25b7'
 exports.isUUIDPattern = /.*[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
 
 /** title to use when viewing general activity, i.e. without a name filter */
-exports.titleWhenNothingSelected = 'Recent Activity'
+exports.titleWhenNothingSelected = 'Recent Activations'
 
 /**
  * Flatten an array of arrays

tests/lib/openwhisk.js

@@ -21,7 +21,7 @@ exports.cleanAll = auth => {
     const ow = require('openwhisk')({
         apihost: process.env.__OW_API_HOST || process.env.API_HOST || process.env.APIHOST || localWskProps().APIHOST || 'openwhisk.ng.bluemix.net',
         api_key: auth || process.env.__OW_API_KEY || process.env.AUTH || localWskProps().AUTH,
-        ignore_certs: process.env.IGNORE_CERTS || process.env.INSECURE_SSL || localWskProps().INSECURE_SSL
+        ignore_certs: process.env.IGNORE_CERTS || process.env.INSECURE_SSL || localWskProps().INSECURE_SSL || localWskProps().APIHOST.indexOf('localhost') >= 0 || localWskProps().APIHOST.startsWith('192.') || localWskProps().APIHOST.startsWith('172.') || localWskProps().APIHOST.startsWith('https://192.') || localWskProps().APIHOST.startsWith('https://172.')
     })
 
     /** log a message, then call the given function */

tests/lib/ui.js

@@ -142,7 +142,7 @@ exports.cli = {
     waitForRepl: (app, prefs={}) => app.client.waitForExist(selectors.CURRENT_PROMPT, timeout)
         .then(() => app.client.waitForText(selectors.APIHOST, timeout))
         .then(() => app.client.getText(selectors.APIHOST))
-        .then(apihost => assert.equal(apihost.toLowerCase(), (prefs.API_HOST || constants.API_HOST).toLowerCase()))
+        .then(apihost => assert.equal(apihost.toLowerCase().replace(/^https:\/\//,''), (prefs.API_HOST || constants.API_HOST).toLowerCase().replace(/^https:\/\//,'')))
         .then(() => {
             if (!prefs || !prefs.noAuthOk) {
                 return app.client.waitForText(selectors.NAMESPACE, timeout)

tests/package-lock.json

@@ -49,7 +49,7 @@ describe('List activations, then drill down to summary views', function() {
                                })))
                   .then(() => this.app)
                   .then(sidecar.expectOpen)
-                  .then(sidecar.expectShowing('Recent Activity'))
+                  .then(sidecar.expectShowing('Recent Activations'))
                   .catch(common.oops(this)))
     }
 

tests/tests/passes/04/z-activation-list-drilldowns.js

@@ -116,7 +116,7 @@ describe('Bottom bar back button functionality', function() {
         const once = iter => cli.do('grid', this.app)
             .then(cli.expectOK)
               .then(sidecar.expectOpen)
-              .then(sidecar.expectShowing('Recent Activity'))
+              .then(sidecar.expectShowing('Recent Activations'))
 
                // find cell1, click, then click back
               .then(() => this.app.client.getAttribute(cell1, 'data-action-name'))
@@ -125,7 +125,7 @@ describe('Bottom bar back button functionality', function() {
                     .then(sidecar.expectShowing(actionName)))
               .then(() => this.app.client.click(ui.selectors.SIDECAR_BACK_BUTTON))
               .then(() => this.app)
-              .then(sidecar.expectShowing('Recent Activity'))
+              .then(sidecar.expectShowing('Recent Activations'))
 
               .catch(err => {
                   console.error(err)
@@ -143,7 +143,7 @@ describe('Bottom bar back button functionality', function() {
         const once = iter => cli.do('grid', this.app)
             .then(cli.expectOK)
               .then(sidecar.expectOpen)
-              .then(sidecar.expectShowing('Recent Activity'))
+              .then(sidecar.expectShowing('Recent Activations'))
 
               // find cell1, click, then click back
               .then(() => this.app.client.getAttribute(cell1, 'data-action-name'))
@@ -152,7 +152,7 @@ describe('Bottom bar back button functionality', function() {
                     .then(sidecar.expectShowing(actionName)))
               .then(() => this.app.client.click(ui.selectors.SIDECAR_BACK_BUTTON))
               .then(() => this.app)
-              .then(sidecar.expectShowing('Recent Activity'))
+              .then(sidecar.expectShowing('Recent Activations'))
 
               // find cell2, click, then click back
               .then(() => this.app.client.getAttribute(cell2, 'data-action-name'))
@@ -161,7 +161,7 @@ describe('Bottom bar back button functionality', function() {
                     .then(sidecar.expectShowing(actionName)))
               .then(() => this.app.client.click(ui.selectors.SIDECAR_BACK_BUTTON))
               .then(() => this.app)
-              .then(sidecar.expectShowing('Recent Activity'))
+              .then(sidecar.expectShowing('Recent Activations'))
 
               .catch(err => {
                   console.error(err)