itemengine-cypress-automation 1.0.316-update-package-version-7582a78.0 → 1.0.316

package/Dockerfile

@@ -34,8 +34,6 @@ RUN chmod +x ./deploy/matchingDropdownQuestion/run.sh
 RUN chmod +x ./deploy/listOrderingDropdownQuestion/run.sh
 RUN chmod +x ./deploy/listOrderingQuestion/run.sh
 RUN chmod +x ./deploy/listOrderingReorderQuestion/run.sh
-RUN chmod +x ./deploy/essayResponseBasicQuestion/run.sh
-RUN chmod +x ./deploy/essayResponseMathQuestion/run.sh
 
 RUN npm ci
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.316-update-package-version-7582a78.0",
+  "version": "1.0.316",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "cy:ilprod": "cypress open --env fileConfig=ilprod",
     "cy:ilqa": "cypress open --env fileConfig=ilqa",
     "cy:ilstage": "cypress open --env fileConfig=ilstage",
-    "spinnaker:essayResponse": "node scripts/questions.mjs --env theme=ilc,questionType=EssayResponse,grepTags=-css+-a11y",
+    "spinnaker:essayResponse": "node scripts/questions.mjs --env theme=ilc,questionType=EssayResponse_EssayResponseBasic_EssayResponseMath,grepTags=-css+-a11y",
     "spinnaker:thinkSphereQuestion": "node scripts/questions.mjs --env theme=ilc,questionType=ThinkSphere,grepTags=-css+-a11y",
     "spinnaker:textEntryMath": "node scripts/questions.mjs --env theme=ilc,questionType=TextEntryMath,grepTags=-css+-a11y",
     "spinnaker:textEntryMathImage": "node scripts/questions.mjs --env theme=ilc,questionType=TextEntryMathWithImage,grepTags=-css+-a11y",
@@ -36,9 +36,7 @@
     "spinnaker:matchingDropdown": "node scripts/questions.mjs --env theme=ilc,questionType=MatchingDropdown,grepTags=-css+-a11y",
     "spinnaker:listOrderingDropdown": "node scripts/questions.mjs --env theme=ilc,questionType=ListOrderingDropdown,grepTags=-css+-a11y",
     "spinnaker:listOrdering": "node scripts/questions.mjs --env theme=ilc,questionType=ListOrderingNew,grepTags=-css+-a11y",
-    "spinnaker:listOrderingReorder": "node scripts/questions.mjs --env theme=ilc,questionType=ListOrderingReorderAsASeperateList,grepTags=-css+-a11y",
-    "spinnaker:essayResponseBasic": "node scripts/questions.mjs --env theme=ilc,questionType=EssayResponseBasic,grepTags=-css+-a11y",
-    "spinnaker:essayResponseMath": "node scripts/questions.mjs --env theme=ilc,questionType=EssayResponseMath,grepTags=-css+-a11y"
+    "spinnaker:listOrderingReorder": "node scripts/questions.mjs --env theme=ilc,questionType=ListOrderingReorderAsASeperateList,grepTags=-css+-a11y"
   },
   "repository": {
     "type": "git",
@@ -60,4 +58,4 @@
   "devDependencies": {
     "@applitools/eyes-cypress": "^3.47.0"
   }
-}
+}

package/scripts/sorry-cypress.mjs

@@ -181,16 +181,26 @@ export function runSorryCypressQuestions() {
     const user = OS.userInfo().username;
     startTime = Math.round(Date.now() / 1000000);
     ciBuildId = setCiBuildId(user, startTime);
-    const envArgs = setCommandLineEnvArgs();
-    console.log("🚀 ~ runSorryCypressQuestions ~ envArgs:", envArgs)
-    
-    // Extracting questionType from envArgs
+    let envArgs = setCommandLineEnvArgs();
+    console.log("🚀 ~ runSorryCypressQuestions ~ envArgs (before removing questionType):", envArgs);
+
+    // Extract and remove questionType from envArgs
     const match = envArgs.match(/questionType=([^,]+)/);
-    console.log("🚀 ~ runSorryCypressQuestions ~ match:", match)
     const questionType = match ? match[1] : "**"; // Default to "**" if not found
-    console.log("🚀 ~ runSorryCypressQuestions ~ questionType:", questionType)
+    console.log("🚀 ~ runSorryCypressQuestions ~ questionType:", questionType);
+
+    envArgs = envArgs.replace(/questionType=[^,]+,?/, "").trim(); // Remove questionType from envArgs
+    console.log("🚀 ~ runSorryCypressQuestions ~ envArgs (after removing questionType):", envArgs);
+
+    // Handling multiple question types (underscore-separated)
+    const questionTypes = questionType.split("_");
+    console.log("🚀 ~ runSorryCypressQuestions ~ questionTypes:", questionTypes);
+
+    // Creating spec paths for Cypress
+    const specPaths = questionTypes.map(type => `cypress/e2e/ILC/${type}/**/*.js`).join(",");
+    console.log("🚀 ~ runSorryCypressQuestions ~ specPaths:", specPaths);
 
-    let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/${questionType}/**/*.js"`;
+    let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "${specPaths}"`;
     console.log(`command: ${command}`);
     execSync(command, { stdio: "inherit" });
 }

package/deploy/essayResponseBasicQuestion/deploy.yaml

@@ -1,30 +0,0 @@
-global:
-  team: itemengine
-  name: item-engine-ui-essay-response-basic
-  type: integration_test
-
-variables:
-  START_TIME: "$(date +%s)"
-
-deployment:
-  job:
-    backoffLimit: 25
-    activeDeadlineSeconds: 7200
-    parallelism: 7
-    completions: 7
-
-  image:
-    cmd: /ie-e2e/deploy/essayResponseBasicQuestion/run.sh
-
-  resources:
-    limits:
-      memory: 8446Mi
-      cpu: 5000m
-    requests:
-      memory: 4096Mi
-      cpu: 2000m
-
-  env:
-    instance:
-      - name: START_TIME
-        value: "${{ variables.START_TIME }}"

package/deploy/essayResponseBasicQuestion/run.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-env=$STAGE
-echo Environment to test: $env
-echo START_TIME: $START_TIME
-echo "Running Essay Response basic question test"
-
-npm run spinnaker:essayResponseBasic 

package/deploy/essayResponseMathQuestion/deploy.yaml

@@ -1,30 +0,0 @@
-global:
-  team: itemengine
-  name: item-engine-ui-essay-response-math
-  type: integration_test
-
-variables:
-  START_TIME: "$(date +%s)"
-
-deployment:
-  job:
-    backoffLimit: 25
-    activeDeadlineSeconds: 7200
-    parallelism: 2
-    completions: 2
-
-  image:
-    cmd: /ie-e2e/deploy/essayResponseMathQuestion/run.sh
-
-  resources:
-    limits:
-      memory: 8446Mi
-      cpu: 5000m
-    requests:
-      memory: 4096Mi
-      cpu: 2000m
-
-  env:
-    instance:
-      - name: START_TIME
-        value: "${{ variables.START_TIME }}"

package/deploy/essayResponseMathQuestion/run.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-env=$STAGE
-echo Environment to test: $env
-echo START_TIME: $START_TIME
-echo "Running Essay Response math question test"
-
-npm run spinnaker:essayResponseMath