Merge branch 'develop' into feature/validateVariables

Author: mikepsinn

cypress/cypress-functions.ts

@@ -241,7 +241,6 @@ export function runOneCypressSpec(specName: string, cb: ((err: any) => void)) {
     const browser = process.env.CYPRESS_BROWSER || "electron"
     const context = specName.replace("_spec.js", "") + "-" + releaseStage
     qmGit.setGithubStatus("pending", context, `Running ${context} Cypress tests...`)
-    console.info("Running " + specPath + "...")
     // noinspection JSUnresolvedFunction
     cypress.run({
         browser,
@@ -280,6 +279,7 @@ export function runOneCypressSpec(specName: string, cb: ((err: any) => void)) {
             console.error(runtimeError)
             process.exit(1)
         })
+        qmLog.logEndOfProcess(specPath)
     })
 }
 
@@ -305,6 +305,7 @@ function getSpecsPath() {
 }
 
 export function runCypressTestsInParallel(cb?: (err: any) => void) {
+    qmLog.logStartOfProcess("runCypressTestsInParallel")
     deleteSuccessFile()
     try {
         copyCypressEnvConfigIfNecessary()
@@ -340,13 +341,15 @@ export function runCypressTestsInParallel(cb?: (err: any) => void) {
                         if (cb) {
                             cb(false)
                         }
+                        qmLog.logEndOfProcess("runCypressTestsInParallel")
                 })
             })
         })
     })
 }
 
 export function runCypressTests(cb?: (err: any) => void) {
+    qmLog.logStartOfProcess("runCypressTests")
     deleteSuccessFile()
     try {
         copyCypressEnvConfigIfNecessary()
@@ -379,6 +382,7 @@ export function runCypressTests(cb?: (err: any) => void) {
                                     }
                                 })
                         }
+                        qmLog.logEndOfProcess("runCypressTests")
                         resolve()
                     })
                 }))
@@ -419,6 +423,7 @@ function deleteLastFailedCypressTest() {
 }
 // tslint:disable-next-line:unified-signatures
 export function runLastFailedCypressTest(cb: (err: any) => void) {
+    qmLog.logStartOfProcess("runLastFailedCypressTest")
     getLastFailedCypressTest()
         .then(function(name) {
             if (!name) {

cypress/cypress-runner.ts

@@ -1,3 +1,4 @@
+import * as qmLog from "../ts/qm.log"
 import * as qmTests from "./cypress-functions"
 import {loadEnv} from "../ts/env-helper"
 // loadEnv("local")
@@ -9,16 +10,17 @@ const PARALLEL = false // Doesn't work for some reason
 if (specName) {
     console.log("Only running process.env.SPEC_NAME "+specName)
     qmTests.runOneCypressSpec(specName, function() {
-        console.info("Done with "+specName)
+        qmLog.logEndOfProcess(specName)
     })
 } else if (PARALLEL) {
     console.log("runCypressTestsInParallel")
     qmTests.runCypressTestsInParallel()
 } else {
     console.log("runLastFailedCypressTest and then run runCypressTests")
     qmTests.runLastFailedCypressTest(function(err: any): void {
-        console.log("Done with runLastFailedCypressTest. Going to run all now...")
+        qmLog.logEndOfProcess("runLastFailedCypressTest")
         if (err) { throw err }
+        console.log("Done with runLastFailedCypressTest. Going to run all now...")
         qmTests.runCypressTests()
     })
 }

gulpfile.js

@@ -258,6 +258,12 @@ var qmLog = {
             .replace(/\s+/g, '-') // collapse whitespace and replace by a dash
             .replace(/-+/g, '-'); // collapse dashes
         return str;
+    },
+    logStartOfProcess: function (str){
+        console.log("STARTING "+str+"\n====================================")
+    },
+    logEndOfProcess: function (str){
+        console.log("====================================\n"+"DONE WITH "+str)
     }
 };
 var bugsnag = require("bugsnag");
@@ -1295,7 +1301,26 @@ var timeHelper = {
     secondsAgo: function(unixTimestamp) {return Math.round((timeHelper.getUnixTimestampInSeconds() - unixTimestamp));}
 };
 gulp.Gulp.prototype.__runTask = gulp.Gulp.prototype._runTask; // Lets us get task name
-gulp.Gulp.prototype._runTask = function(task) { this.currentTask = task; this.__runTask(task);};
+gulp.Gulp.prototype._runTask = function(task) {
+    this.currentTask = task;
+    this.__runTask(task);
+};
+
+gulp.on('task_start', function(e) {
+    // TODO: batch these
+    // so when 5 tasks start at once it only logs one time with all 5
+    //gutil.log('Starting', '\'' + chalk.cyan(e.task) + '\'...');
+    qmLog.logStartOfProcess(e.task);
+});
+
+gulp.on('task_stop', function(e) {
+    // var time = prettyTime(e.hrDuration);
+    // gutil.log(
+    //     'Finished', '\'' + chalk.cyan(e.task) + '\'',
+    //     'after', chalk.magenta(time)
+    // );
+    qmLog.logEndOfProcess(e.task);
+});
 // Set the default to the build task
 gulp.task('default', ['configureApp']);
 // Executes taks specified in winPlatforms, linuxPlatforms, or osxPlatforms based on

package-lock.json

@@ -19,7 +19,7 @@
     "@slack/types": "1.9.0",
     "@slack/webhook": "5.0.3",
     "angular": "latest",
-    "aws-sdk": "2.939.0",
+    "aws-sdk": "2.940.0",
     "aws-sdk-mock": "4.5.0",
     "beautify": "0.0.8",
     "chai": "4.3.4",
@@ -56,7 +56,7 @@
     "fs-extra": "8.1.0",
     "ghost-inspector": "4.0.1",
     "git-repo-name": "1.0.1",
-    "husky": "7.0.0",
+    "husky": "7.0.1",
     "ionic-plugin-keyboard": "2.2.1",
     "jasmine": "3.8.0",
     "js-beautify": "1.14.0",
@@ -86,14 +86,14 @@
     "yaml-lint": "1.2.4"
   },
   "dependencies": {
-    "@bugsnag/js": "7.10.4",
+    "@bugsnag/js": "7.10.5",
     "@bugsnag/plugin-express": "7.10.0",
     "@capacitor/core": "2.4.7",
     "@octokit/rest": "16.35.2",
     "@types/angular": "latest",
     "@types/app-root-path": "1.2.4",
-    "@types/bluebird": "3.5.35",
-    "@types/chai": "4.2.19",
+    "@types/bluebird": "3.5.36",
+    "@types/chai": "4.2.20",
     "@types/dotenv": "6.1.1",
     "@types/gulp": "4.0.7",
     "@types/mime": "2.0.3",

package.json

@@ -853,6 +853,12 @@ var qmLog = {
             .replace(/\s+/g, '-') // collapse whitespace and replace by a dash
             .replace(/-+/g, '-'); // collapse dashes
         return str;
+    },
+    logStartOfProcess: function (str){
+        console.log("STARTING "+str+"\n====================================")
+    },
+    logEndOfProcess: function (str){
+        console.log("====================================\n"+"DONE WITH "+str)
     }
 };
 function getCalleeFunction(){

src/js/qmLogger.js

@@ -98,9 +98,8 @@ export const githubStatusStates = {
 // tslint:disable-next-line:max-line-length
 export function setGithubStatus(testState: "error" | "failure" | "pending" | "success", context: string,
                                 description: string, url?: string | null, cb?: ((arg0: any) => void) | undefined) {
-    if (testState === "error") {
-        qmLog.error(description + " " + context)
-    }
+    if(testState === "pending") {qmLog.logStartOfProcess(context)}
+    if (testState === "error") {qmLog.error(description + " " + context)}
     qmLog.info("Setting status on Github: "+ description + " " + context)
     description = _str.truncate(description, 135)
     url = url || getBuildLink()
@@ -124,6 +123,7 @@ export function setGithubStatus(testState: "error" | "failure" | "pending" | "su
         target_url: url,
     }
     console.log(`${context} - ${description} - ${testState} at ${url}`)
+    if(testState !== "pending") {qmLog.logEndOfProcess(context)}
     getOctoKit().repos.createStatus(params).then((data: any) => {
         if (cb) {
             cb(data)

ts/qm.git.ts

@@ -161,3 +161,11 @@ export function logErrorAndThrowException(message: string, object?: any) {
     error(message, object)
     throw message
 }
+
+export function logStartOfProcess(str: string) {
+    console.log("STARTING "+str+"\n====================================")
+}
+
+export function logEndOfProcess(str: string) {
+    console.log("====================================\n"+"DONE WITH "+str)
+}