itemengine-cypress-automation 1.0.525-IEI-5333-1de7123.0 → 1.0.525-IEI-6793-v-5798178.0

package/Dockerfile

@@ -28,6 +28,7 @@ RUN chmod +x ./deploy/resourcesAndToolsQuestion/run.sh
 RUN chmod +x ./deploy/audioResponseQuestion/run.sh
 RUN chmod +x ./deploy/dataApi/run.sh
 RUN chmod +x ./deploy/feedbackScaleQuestion/run.sh
+RUN chmod +x ./run.sh
 
 RUN npm ci
 

package/cypress/pages/audioPlayerPage.js

@@ -61,7 +61,7 @@ const selectors = {
     playAttemptsLimitInputField: () => cy.get('.freeResponseAudioFormTextInput input'),
     studentViewSettingsLabel: () => cy.get('[class*="AudioPlayerstyles__TranscriptLabelWrapper"]').eq(0),
     audioOverviewLabel: () => cy.get('.additional-settings-label'),
-    audioOverviewInputField: () => cy.get('[aria-label="Description"]'),
+    audioOverviewInputField: () => cy.get('[title="Description"]'),
     transcriptLabel: () => cy.get('[class*="TranscriptWrapper"] [class*="AudioPlayerstyles__TranscriptLabelWrapper"]'),
     uploadTranscriptUploadLabel: () => cy.get('[class*="AudioPlayerstyles__AudioLabel"]').eq(2),
     uploadTranscriptFileNameLabel: () => cy.get('[class*="AudioPlayerstyles__AudioLabel"]').eq(3),
@@ -72,7 +72,7 @@ const selectors = {
     transcriptFileUploadProgressBar: () => cy.get('.audio-player-form-progressbar'),
     transcriptInputFieldLabel: () => cy.get('.additional-settings-label').eq(1),
     deleteTranscriptButton: () => cy.get('[aria-label*="Delete"]'),
-    transcriptCKeditorInputField: () => cy.get('div[contenteditable="true"][aria-label="Transcript"]'),
+    transcriptCKeditorInputField: () => cy.get('div[contenteditable="true"][aria-label="Transcript"][title="Transcript"]'),
     //Preview tab
     volumeControlButton: () => cy.get('.audio-player-volume-wrapper .audio-player-icon'),
     playbackPlayButton: () => cy.get('.audio-resource-preview-wrapper-without-print button[aria-label="Play"]'),

package/cypress/pages/components/additionalSettingsPanel.js

@@ -10,9 +10,9 @@ const selectors = {
     additionalSettingsTeacherGuidelinesLabel: () => cy.get('.additional-settings-detail-wrapper .additional-settings-label').eq(0),
     additionalSettingsSampleAnswerLabel: () => cy.get('.additional-settings-detail-wrapper .additional-settings-label').eq(1),
     additionalSettingsAcknowledgementsLabel: () => cy.get('.additional-settings-detail-wrapper .additional-settings-label').eq(2),
-    additionalSettingsTeacherGuidelinesInputField: () => cy.get('[aria-label="Teacher Scoring Guidelines"]'),
-    additionalSettingsSampleAnswerInputField: () => cy.get('[aria-label="Sample Answer"]'),
-    additionalSettingsAcknowledgementsInputField: () => cy.get('[aria-label="acknowledgements and references"]'),
+    additionalSettingsTeacherGuidelinesInputField: () => cy.get('[title="Teacher Scoring Guidelines"]'),
+    additionalSettingsSampleAnswerInputField: () => cy.get('[title="Sample Answer"]'),
+    additionalSettingsAcknowledgementsInputField: () => cy.get('[title="acknowledgements and references"]'),
     //Font-size dropdown
     fontSizeLabel: () => cy.get('#Font-Size-dropdown-label'),
     fontSizeDropdown: () => cy.get('#Font-Size-select'),

package/cypress/pages/components/essayResponseCommonComponents.js

@@ -72,7 +72,7 @@ const selectors = {
     wordCountWrapper: () => cy.get('[class*="indexstyle__WordCharCountWrapper"]'),
 
     //Preview tab
-    responseField: () => cy.get('[aria-label="Answer"]'),
+    responseField: () => cy.get('[title="Enter your response to the question here."]'),
     responseFieldWordCount: () => cy.get('[class*="InputLimitLabelWrapper"]'),
     responseFieldEquation: () => cy.get('.cke_widget_element'),
     responseFieldText: () => cy.get('[class*="EssayResponseGradingViewstyle__GradingViewWrapper"] .question-text-wrapper'),
@@ -82,7 +82,7 @@ const selectors = {
     //Additional settings, These are old selectors. Need to update them along with additional settings file revamp
     studentResponseAndLayoutLabel: () => cy.get('.layout-text'),
     predefinedTextLabel: () => cy.get('[class*="EssayResponsestyles__PropertyLabel"]'),
-    predefinedTextInputField: () => cy.get('[aria-label="Predefined Text"]'),
+    predefinedTextInputField: () => cy.get('[title="Predefined Text"]'),
     placeholderTextLabel: () => cy.get('.place-holder-text .text-label'),
     placeholderTextInputField: () => cy.get('[aria-label="Placeholder Text"]'),
     minHeightLabel: () => cy.get('.size-wrapper .text-label').eq(0),

package/cypress/pages/components/gridQuestionCommonComponent.js

@@ -34,8 +34,8 @@ const selectors = {
     editCellPropertyRow: () => gridQuestionCommonComponent.editCellPropertyTableWrapper().find('[class*="wrapper-row"]'),
     editCellPropertyTableLeftPaginationButton: () => cy.get('.authoring-selection-grid [class*="SelectionGridstyles__PaginationLeftControl"]'),
     editCellPropertyTableRightPaginationButton: () => cy.get('.authoring-selection-grid [class*="SelectionGridstyles__PaginationRightControl"]'),
-    cellPropertyInputField: () => cy.get('[aria-label*="text"], [class*="SelectionGridstyles__AuthoringHeadingWrapper"] input, [class*="SelectionGridstyles"] input'),
-    optionCellPropertyInputField: () => cy.get('[aria-label="Option text or image..."],[placeholder="Option text or image..."]'),
+    cellPropertyInputField: () => cy.get('[title*="text"], [class*="SelectionGridstyles__AuthoringHeadingWrapper"] input, [class*="SelectionGridstyles"] input'),
+    optionCellPropertyInputField: () => cy.get('[title="Option text or image..."],[placeholder="Option text or image..."]'),
     tableRowSpecifyCorrectAnswerSection: () => cy.get('.correct-answer-accordion [class*="wrapper-row"]'),
     tableRowPreviewTab: () => cy.get('[class*="question-preview-wrapper"] [class*="wrapper-row"]'),
     tableRowHeadersSpecifyCorrectAnswerSection: () => cy.get('.set-correct-ans-selection-grid .cell-content-text'),

package/cypress/pages/components/questionInputFieldComponent.js

@@ -3,7 +3,7 @@ import { commonComponents } from "./commonComponents";
 
 const selectors = {
     questionLabel: () => cy.get('.cloze-with-text-question-wrapper .title-casing'),
-    questionInputField: () => cy.get('.cloze-with-text-question-wrapper [aria-label="question"]'),
+    questionInputField: () => cy.get('.cloze-with-text-question-wrapper [title="question"]'),
     responseArea: () => cy.get('.cke_widget_wrapper_add_response_element'),
     responseAreaCloseButton: () => cy.get('.add_response_close'),
     addResponseAreaButton: () => cy.get('.add-response-token-wrapper-cls button'),

package/cypress/pages/components/questionInstructionsComponent.js

@@ -5,7 +5,7 @@ const css = Cypress.env('css');
 
 const selectors = {
     questionInstructionsLabelEditTab: () => cy.get('.edit-question-instruction-label'),
-    questionInstructionsInputField: () => cy.get('[aria-label="Question Instructions"]'),
+    questionInstructionsInputField: () => cy.get('[title="Question Instructions"]'),
     questionInstructionsText: () => cy.get('.question-instruction'),
     questionInstructionsWrapper: () => cy.get('.edit-question-instruction-wrapper'),
     questionInstructionsTextPreviewTab: () => cy.get('.question-instruction:visible'),

package/cypress/pages/contentBlocksPage.js

@@ -15,7 +15,7 @@ const selectors = {
     groupDividerWrapper: () => cy.get('.body-group-divider'),
     textBlockWrapper: () => cy.get('.body-text-block'),
     textBlockLabel: () => cy.get('.body-section-header'),
-    textBlockInputField: () => cy.get('[aria-label="Enter text block"]'),
+    textBlockInputField: () => cy.get('[title="Enter text block"]'),
     bodyLabel: () => cy.get('.options-label'),
     bodyWrapper: () => cy.get('.edit-mcq-options-wrapper'),
     bodySubTitleLabel: () => cy.get('.body-section-header'),

package/cypress/pages/essayResponsePage.js

@@ -129,7 +129,7 @@ const hyperlinkDialogBox = {
     hyperlinkDialogboxURLInputField: () => essayResponsePage.hyperlinkDialogBox().find('input[class*="cke_dialog_ui_input_text"]').eq(1),
     hyperlinkDialogboxButtonOk: () => cy.get('.action-button-wrapper [role="button"]').eq(1),
     hyperlinkDialogboxButtonCancel: () => cy.get('.action-button-wrapper [role="button"]').eq(0),
-    previewInputFieldHyperlinkText: () => cy.get('div[aria-label="Answer"] a'),
+    previewInputFieldHyperlinkText: () => cy.get('div[title="Enter your response to the question here."] a'),
 }
 
 const steps = {

package/cypress/pages/textSelectionPage.js

@@ -25,7 +25,7 @@ const selectors = {
     ...showAvailableOptionsToStudents,
     ...showStudentMaximumNumberOfPossibleSelections,
     questionLabel: () => cy.get('[class*="Highlightstyles__QuestionComponentWrapper"] .title-casing'),
-    questionInputField: () => cy.get('[class*="Highlightstyles__QuestionComponentWrapper"] [aria-label="Question"]'),
+    questionInputField: () => cy.get('[class*="Highlightstyles__QuestionComponentWrapper"] [title="Question"]'),
     specifyPossibleOptionsTextFieldWrapper: () => cy.get('[class*="Highlightstyles__HighLightWrapper"] .question-text-wrapper'),
     textSelectionStyleLabel: () => cy.get('.text-selection-style .options-label'),
     textSelectionStyleButtonLabel: (ariaLabel = null) => {

package/il.yaml

@@ -13,22 +13,7 @@ otk:
     languageVersion: "20"
     analysis: false
   deployables:
-    - ./deploy/audioResponseQuestion/service.yaml
-    - ./deploy/DNDIntoCategoriesQuestion/service.yaml
-    - ./deploy/dataApi/service.yaml
-    - ./deploy/e2e/service.yaml
-    - ./deploy/essayQuestion/service.yaml
-    - ./deploy/feedbackScaleQuestion/service.yaml
-    - ./deploy/fillInTheGapsQuestion/service.yaml
-    - ./deploy/graphingQuestion/service.yaml
-    - ./deploy/imageHighlightQuestion/service.yaml
-    - ./deploy/listOrderingQuestion/service.yaml
-    - ./deploy/migration/service.yaml
-    - ./deploy/multipleSelectionQuestion/service.yaml
-    - ./deploy/resourcesAndToolsQuestion/service.yaml
-    - ./deploy/smoke/service.yaml
-    - ./deploy/textEntryMathQuestion/service.yaml
-    - ./deploy/thinkSphere/service.yaml
+    - ./service.yaml
   deployConfig:
     environments:
       - dev

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.525-IEI-5333-1de7123.0",
+  "version": "1.0.525-IEI-6793-v-5798178.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/run.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "Running integration test"

package/scripts/run-status-check.mjs

@@ -2,7 +2,7 @@ import axios from "axios";
 
 const sorryCypressTimeout = 1800000;
 const graphqlUrl = "https://cypress-api.imaginelearning.tech/";
-const projectId = "imaginelearning/itemengine-edgeex-cypress-automation";
+const projectId = "imaginelearning/itemengine-cypress-automation";
 
 function getProjectId() {
     return process.env.CYPRESS_PROJECT_ID || projectId;

package/scripts/sorry-cypress.mjs

@@ -158,7 +158,7 @@ export function runSorryCypressLocal() {
 /**
  * @method runSorryCypressSpinnaker
  */
-export function runSorryCypressSpinnaker() {
+export async function runSorryCypressSpinnaker() {
     console.log('Inside runSorryCypressSpinnaker');
     process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.tech/";
     console.log('CYPRESS_API_URL:', process.env.CYPRESS_API_URL);
@@ -168,9 +168,28 @@ export function runSorryCypressSpinnaker() {
     console.log('ciBuildId:', ciBuildId);
     const envArgs = setCommandLineEnvArgs()
     console.log('envArgs:', envArgs);
+    const isOtkv2 = process.env.OTK_VERSION === '2';
     let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/**/*.js"`;
     console.log(`command: ${command}`);
-    execSync(command, { stdio: "inherit" });
+    try {
+        execSync(command, { stdio: "inherit" });
+        if (isOtkv2) {
+            const status = await checkRunStatus(ciBuildId);
+            process.exit(status);
+        }
+    } catch (error) {
+        console.error("One or more tests failed to pass, OR an error occurred during run");
+        console.error("Cypress run error details:", {
+            status: error.status,
+            message: error.message,
+            stack: error.stack
+        });
+
+        console.log("Exiting process with code: 1");
+        process.exit(1);
+    }
+    console.log("Cypress tests all passed successfully. Exiting process with code: 0");
+    process.exit(0);
 }
 
 /**

package/service.yaml

@@ -0,0 +1,80 @@
+global:
+  name: ie-cypress
+  type: test
+  autoDeploy:
+    enabled: true
+    highestEnvironment: staging
+
+deployment:
+  activeDeadlineSeconds: 28800
+  architecture: amd64
+  restartPolicy: Never
+  backoffLimit: 0
+  parallelism: 7
+  completions: 7
+  image:
+    cmd: /ie-e2e/run.sh
+  resources:
+    limits:
+      memory: 8446Mi
+      cpu: 5000m
+    requests:
+      memory: 4096Mi
+      cpu: 2000m
+  egress:
+    FQDNs:
+      - "*.content-nonprod.imaginelearning.com"
+      - "*.cloudflare.com"
+      - "*.googleapis.com"
+      - "www.desmos.com"
+      - "*.google.com"
+      - "*.*.google.com"
+      - "google-ohttp-relay-safebrowsing.fastly-edge.com"
+      - "*.gstatic.com"
+      - "*.codecogs.com"
+      - "cypress-director.imaginelearning.tech"
+      - "cypress-api.imaginelearning.tech"
+      - "*.cypress.io"
+      - "*.*.mozilla.com"
+      - "*.*.*.mozilla.com"
+  env:
+    - name: OTK_VERSION
+      value: "2"
+    - name: CYPRESS_API_URL
+      value: "https://cypress-director.imaginelearning.tech/"
+    - name: THEME
+      value: "ilc"
+    - name: GREP_TAGS
+      value: ""
+    - name: GREP_UNTAGGED
+      value: ""
+    - name: SPEC_PATTERN
+      value: ""
+    - name: QUESTION_TYPE
+      value: "AudioResponseNew_VideoResponseNew_UploadResponse_ToolAudioPlayerNew"
+  
+namespaces:
+  dev:
+    env:
+      - name: STAGE
+        value: "dev"
+      - name: FILE_CONFIG
+        value: "dev"
+  qa:
+    env:
+      - name: STAGE
+        value: "qa"
+      - name: FILE_CONFIG
+        value: "qa"
+  staging:
+    env:
+      - name: STAGE
+        value: "stage"
+      - name: FILE_CONFIG
+        value: "stage"
+  prod:
+    env:
+      - name: STAGE
+        value: "prod"
+      - name: FILE_CONFIG
+        value: "prod"