itemengine-cypress-automation 1.0.76 → 1.0.77

package/.build_wna

@@ -1,4 +1,9 @@
 build:
-  env:
-    - key: CYPRESS_API_URL
-      value: https://cypress-director.imaginelearning.engineering/
+  image: npm-node18
+  image_version_prefix: -v2
+  sonar_scan: true
+  pr:
+    enabled: true
+    deployable: true
+  analysis:
+    enabled: true

package/Dockerfile

@@ -2,7 +2,7 @@
 # FROM cypress/base:14.19.0
 # FROM cypress/browsers:node14.19.0-chrome100-ff99-edge
 
-FROM cypress/included:12.17.2
+FROM cypress/included:12.0.0
 
 RUN apt-get update && apt-get install curl -y
 

package/README.md

@@ -1,3 +1 @@
 # itemengine-cypress-automation
-
-npx cypress-cloud run  --spec cypress\e2e\saucedemo.js  --parallel --record --key xxx --ci-build-id hello-cypress-4 --headed --env fileConfig=ilqa,theme=ilc,grepTags=-a11y

package/cypress.config.js

@@ -2,33 +2,25 @@ const { defineConfig } = require('cypress')
 const fs = require('fs-extra');
 const path = require('path');
 const { isFileExist } = require('cy-verify-downloads');
-//const { cloudPlugin } = require("cypress-cloud/plugin");
 
 async function getConfigurationByFile(file, theme) {
   const pathToConfigFile = path.resolve(
     './cypress/config-files',
     `${file}.json`
   );
+
   const pathToThemeFile = path.resolve(
     './cypress/fixtures/theme',
     `${theme}.json`
   );
+
   const envVariables = await fs.readJson(pathToConfigFile);
   envVariables.env.css = await fs.readJson(pathToThemeFile);
   return envVariables;
 }
 
 module.exports = defineConfig({
-  reporterOptions: {
-    reportDir: 'cypress/reports',
-    charts: true,
-    reportPageTitle: 'My Test Suite',
-    embeddedScreenshots: true,
-    inlineAssets: true,
-    html: true,
-    json: false,
-  },
-  projectId: "ImagineLearning/itemengine-cypress-automation",
+  projectId: "imaginelearning/itemengine-cypress-automation",
   screenshotOnRunFailure: true,
   screenshotsFolder: 'cypress/assets',
   requestTimeout: 20000,
@@ -37,17 +29,14 @@ module.exports = defineConfig({
   pageLoadTimeout: 120000,
   viewportWidth: 1400,
   viewportHeight: 1025,
-  trashAssetsBeforeRuns: true,
+  trashAssetsBeforeRuns: false,
   chromeWebSecurity: true,
   video: false,
   watchForFileChanges: false,
   scrollBehavior: 'center',
-  blockHosts: [
-    'www.google-analytics.com',
-    '*google-analytics.com',
-    'www.hotjar.com',
-    '*hotjar.com',
-  ],
+  env: {
+    CYPRESS_ENV: process.env.CYPRESS_ENV,
+  },
   e2e: {
     setupNodeEvents(on, config) {
       const file = config.env.fileConfig || 'ilstage';
@@ -66,8 +55,7 @@ module.exports = defineConfig({
       require('@cypress/grep/src/plugin')()
       return config, getConfigurationByFile(file, theme);
     },
-    excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'],
     specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
     testIsolation: false,
   },
-})
+});

package/deploy.yaml

@@ -9,8 +9,8 @@ variables:
 deployment:
   job:
     activeDeadlineSeconds: 7200
-    parallelism: 5
-    completions: 5
+    parallelism: 1
+    completions: 1
 
   image:
     cmd: /ie-e2e/run.sh

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "",
   "main": "index.js",
   "scripts": {
     "build": "echo 'building'",
     "test": "echo 'success'",
-    "spinnaker": "node scripts/spinnaker.mjs --env theme=ilc",
-    "spinnaker:untagged": "node scripts/spinnaker.mjs --env theme=ilc,grepUntagged=true",
     "local": "node scripts/local.mjs --env fileConfig=ilqa,theme=ilc",
+    "spinnaker": "node scripts/spinnaker.mjs --env theme=ilc",
+    "local:untagged": "node scripts/local.mjs --env fileConfig=ilqa,theme=ilc,grepUntagged=true",
+    "spinnaker:untagged": "node scripts/spinnaker.mjs --env theme=ilc,grepUntagged=true",    
     "cy:ildev": "cypress open --env fileConfig=ildev",
     "cy:ilprod": "cypress open --env fileConfig=ilprod",
     "cy:ilqa": "cypress open --env fileConfig=ilqa",
@@ -20,10 +21,11 @@
   },
   "dependencies": {
     "@cypress/grep": "^3.1.5",
-    "axe-core": "^4.8.0",
-    "cy-verify-downloads": "^0.1.13",
-    "cypress": "^12.17.4",
-    "cypress-axe": "^1.5.0",
+    "axe-core": "^4.7.1",
+    "cy-verify-downloads": "^0.1.11",
+    "cy2": "^4.0.9",
+    "cypress": "12.17.2",
+    "cypress-axe": "^1.4.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-real-events": "^1.7.6",
     "react-uuid": "^2.0.0"

package/scripts/sorry-cypress.mjs

@@ -58,37 +58,30 @@ function setCommandLineEnvArgs() {
         tags = ''
     }
 
-    return `--env ${fileConfig}` + (theme ? `,${theme}`: '') + (tags ? `,${tags}`: '')
+    return `--env ${fileConfig}` + (theme ? `,${theme}` : '') + (tags ? `,${tags}` : '')
 }
 
 /**
- * @method runSorryCypress
- * @param {string} ciBuildId
+ * @method runSorryCypressLocal
  */
-function runSorryCypress(ciBuildId, envArgs) {
-    // let command = `cypress-cloud run --parallel --browser chrome --record --key ImagineLearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs}`;
-    let command = `cypress run --parallel --browser chrome --record --key ImagineLearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/ShortTextResponse/*.js"`;
+export function runSorryCypressLocal() {
+    process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.engineering/";
+    const user = OS.userInfo().username;
+    startTime = Math.round(Date.now() / 1000000);
+    ciBuildId = setCiBuildId(user, startTime);
+    const envArgs = setCommandLineEnvArgs()
+    let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/ShortTextResponse/*.js"`;
     execSync(command, { stdio: "inherit" });
 }
 
 /**
  * @method runSorryCypressSpinnaker
  */
-export function runSorryCypressSpinnaker() {
+ export function runSorryCypressSpinnaker() {
+    process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.engineering/";
     startTime = process.env.START_TIME;
     ciBuildId = setCiBuildId("spinnaker", startTime);
     const envArgs = setCommandLineEnvArgs()
-    runSorryCypress(ciBuildId, envArgs);
-}
-
-/**
- * @method runSorryCypressLocal
- */
-export function runSorryCypressLocal() {
-    process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.engineering/";
-    const user = OS.userInfo().username;
-    startTime = Math.round(Date.now() / 1000000);
-    ciBuildId = setCiBuildId(user, startTime);
-    const envArgs = setCommandLineEnvArgs()
-    runSorryCypress(ciBuildId, envArgs);
+    let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/ShortTextResponse/*.js"`;
+    execSync(command, { stdio: "inherit" });
 }

package/currents.config.js

@@ -1,6 +0,0 @@
-// currents.config.js
-module.exports = {
-  projectId: "ImagineLearning/itemengine-cypress-automation",
-  recordKey: "ImagineLearning/itemengine-cypress-automation",
-  cloudServiceUrl: "https://cypress-director.imaginelearning.engineering/"
-};