itemengine-cypress-automation 1.0.9 → 1.0.10

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "",
   "main": "index.js",
   "scripts": {
     "build": "echo 'building'",
     "test": "echo 'success'",
-    "spinnaker": "node scripts/spinnaker.mjs"
+    "spinnaker": "node scripts/spinnaker.mjs --env theme=ilc",
+    "spinnaker:untagged": "node scripts/spinnaker.mjs --env theme=ilc,grepUntagged=true",
+    "local": "node scripts/spinnaker.mjs"
   },
   "repository": {
     "type": "git",

package/scripts/sorry-cypress.mjs

@@ -1,53 +1,98 @@
-import {execSync} from "child_process";
+import { execSync } from "child_process";
 import * as OS from "os";
-// import "dotenv/config";
 
 let ciBuildId;
 let startTime;
+const envArgs = {};
+
+if (process.argv.includes('--env')) {
+    const envArgsString = process.argv[process.argv.findIndex(elem => elem === '--env') + 1];
+    envArgsString.split(',').forEach(arg => {
+        const pair = arg.split('=')
+        const key = pair[0];
+        const value = pair[1];
+        envArgs[key] = value;
+    });
+}
+
+const env = process.env.STAGE ? process.env.STAGE : envArgs.fileConfig;
+
+console.log(envArgs, env)
 
 /**
  * @param {string} user
  * @param {string} startTime
  */
 function setCiBuildId(user, startTime) {
-    console.log('process.env.fileConfig', process.env.fileConfig)
     console.log('process.argv', process.argv)
-    let env = 'staging'//process.env.CYPRESS_ENV;
-    let tagName = process.argv.slice(2).length > 0 ? process.argv.slice(2) : "--";
-    return `${user}[E2E][env:${env}][tags:${tagName}][${startTime}]`
+    let tags;
+    if (envArgs.grepUntagged) {
+        tags = 'untagged';
+    } else if (envArgs.grepTags) {
+        tags = envArgs.grepTags;
+    } else {
+        tags = '--'
+    }
+    return `${user}[E2E][env:${env}][tags:${tags}][${startTime}]`
+}
+
+function setCommandLineEnvArgs() {
+    let theme = envArgs.theme ? `theme=${envArgs.theme}` : '';
+    let tags;
+    let fileConfig;
+
+    if (env === 'dev') {
+        fileConfig = 'fileConfig=ildev'
+    } else if (env === 'stage') {
+        fileConfig = 'fileConfig=ilstage'
+    } else if (env === 'qa') {
+        fileConfig = 'fileConfig=ilqa'
+    } else if (env === 'prod') {
+        fileConfig = 'fileConfig=prod'
+    } else {
+        fileConfig = `fileConfig=${env}`
+    }
+
+    if (envArgs.grepUntagged) {
+        tags = `grepUntagged=${envArgs.grepUntagged}`;
+    } else if (envArgs.grepTags) {
+        tags = `grepTags=${envArgs.grepTags}`;
+    } else {
+        tags = ''
+    }
+
+    return `--env ${fileConfig}` + (theme ? `,${theme}`: '') + (tags ? `,${tags}`: '')
 }
 
 /**
  * @method runSorryCypress
  * @param {string} ciBuildId
  */
-function runSorryCypress(ciBuildId) {
-    process.env.CYPRESS_grepTags = process.argv.slice(2) ?? "";
-    let command = `cypress-cloud run --parallel --browser chrome --record --key ImagineLearning/itemengine-cypress-automation --ci-build-id ${ciBuildId}`;
-    execSync(command, {stdio: "inherit"});
+function runSorryCypress(ciBuildId, envArgs) {
+    let command = `cypress-cloud run --parallel --browser chrome --record --key ImagineLearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs}`;
+    execSync(command, { stdio: "inherit" });
 }
 
 /**
  * @method runSorryCypressSpinnaker
  */
 export function runSorryCypressSpinnaker() {
-    //console.log('process.env.fileConfig', process.env.fileConfig)
     console.log('process.argv', process.argv)
     console.log('process.env.STAGE', process.env.STAGE)
-    //startTime = process.env.START_TIME;
-    //ciBuildId = setCiBuildId("spinnaker", startTime);
-    startTime = Math.round(Date.now() / 100000);
-    console.log(startTime)
-    runSorryCypress(startTime);
+    startTime = process.env.START_TIME;
+    console.log('START_TIME', startTime)
+    ciBuildId = setCiBuildId("spinnaker", startTime);
+    const envArgs = setCommandLineEnvArgs()
+    runSorryCypress(ciBuildId, envArgs);
 }
 
 /**
  * @method runSorryCypressLocal
  */
- export function runSorryCypressLocal() {
+export function runSorryCypressLocal() {
     process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.engineering/";
     const user = OS.userInfo().username;
-    startTime = Math.round(Date.now() / 1000);
+    startTime = Math.round(Date.now() / 100000);
     ciBuildId = setCiBuildId(user, startTime);
-    runSorryCypress(ciBuildId);
+    runSorryCypress(ciBuildId, envArgs);
 }