🐛(tests) more stable tests

.circleci/config.yml

@@ -78,7 +78,8 @@ jobs:
 
   test-e2e:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2022.10.1
+      docker_layer_caching: true
     working_directory: ~/fun
     steps:
       - checkout
@@ -87,10 +88,10 @@ jobs:
           command: docker network create potsie
       - run:
           name: Bootstrap project
-          command: make bootstrap
+          command: make bootstrap run-edx
       - run:
           name: Run e2e tests
-          command: make run-edx test
+          command: make test
 
   lint-test:
     docker:

.eslintignore

@@ -3,3 +3,6 @@ node_modules
 
 e2e/cypress/screenshots
 e2e/cypress/videos
+
+# Don't lint edX sources
+edx/

.gitignore

@@ -11,6 +11,9 @@ data/
 # Sources
 src/
 
+# EdX modules
+edx/modules/
+
 # End-to-end testing
 e2e/cypress/screenshots
 e2e/cypress/videos

e2e/cypress/integration/lms_problem_interaction/drag_and_drop_spec.js

@@ -23,6 +23,15 @@ describe("LMS Drag And Drop Problem Interaction Test", () => {
   before(() => {
     cy.lmsLoginStudent();
     cy.lmsEnroll(true);
+    // Reset Problem
+    const { courseId } = Cypress.env("EDX_COURSES").demoCourse1;
+    const handlerURL = "handler/xmodule_handler/problem_reset";
+    const url = `/courses/${courseId}/xblock/${problem.locator}/${handlerURL}`;
+    const method = "POST";
+    const body = { id: problem.locator };
+    cy.request({ url, method, body }).then((response) => {
+      expect(response.status).to.equal(200);
+    });
     // Navigate to the courseware.
     cy.visit(sectionUrl);
     // Input answers (first image).

e2e/cypress/integration/lms_problem_interaction/js_input_response_spec.js

@@ -7,20 +7,53 @@ describe("LMS JS Input Response Problem Interaction Test", () => {
   const problem = getProblem(section, "jsinputResponse");
   const problemId = getXblockId(problem);
 
+  const getIframeWindow = () => {
+    return cy
+      .get(`#iframe_${problemId}_2_1`)
+      .its("0.contentWindow")
+      .should("exist");
+  };
+
   before(() => {
     cy.lmsLoginStudent();
     cy.lmsEnroll(true);
+    // Reset Problem
+    const { courseId } = Cypress.env("EDX_COURSES").demoCourse1;
+    const handlerURL = "handler/xmodule_handler/problem_reset";
+    const url = `/courses/${courseId}/xblock/${problem.locator}/${handlerURL}`;
+    const method = "POST";
+    const body = { id: problem.locator };
+    cy.request({ url, method, body }).then((response) => {
+      expect(response.status).to.equal(200);
+    });
     // Navigate to the courseware.
     cy.visit(sectionUrl);
+    // Wait for iframe to become interactive.
+    getIframeWindow().and((win) => {
+      expect(win.WebGLDemo).to.be.an("object");
+    });
     // Input wrong answers.
     cy.get(`#iframe_${problemId}_2_1`).click(118, 200);
+    // Wait for iframe state to be updated.
+    getIframeWindow().and((win) => {
+      expect(win.WebGLDemo).to.be.an("object");
+      expect(JSON.parse(win.WebGLDemo.getState())).deep.to.equal({
+        selectedObjects: { cylinder: false, cube: true },
+      });
+    });
     // Submit answer.
     cy.get(".check.Valider").click();
     cy.get(".check.Valider").should("not.have.class", "is-disabled");
     cy.get(`#status_${problemId}_2_1`).should("contain", "incorrect");
     // Input correct answers.
     cy.get(`#iframe_${problemId}_2_1`).click(300, 200);
-    cy.wait(200);
+    // Wait for iframe state to be updated.
+    getIframeWindow().and((win) => {
+      expect(win.WebGLDemo).to.be.an("object");
+      expect(JSON.parse(win.WebGLDemo.getState())).to.deep.equal({
+        selectedObjects: { cylinder: false, cube: false },
+      });
+    });
     // Submit answer.
     cy.get(".check.Valider").click();
     cy.get(".check.Valider").should("not.have.class", "is-disabled");

env.d/cypress

@@ -1,5 +1,6 @@
 CYPRESS_BASE_URL=http://edx_lms:8000
 CYPRESS_RETRIES=9
+CYPRESS_CHROME_WEB_SECURITY=false
 
 [email protected]
 CYPRESS_EDX_ADMIN_PASSWORD=admin