Merge remote-tracking branch 'origin/master' into 188127118-bar-graph…

…-link
concord-consortium · Sep 17, 2024 · de397eb · de397eb
2 parents cb197c0 + 812c3c4
commit de397eb
Show file tree

Hide file tree

Showing 85 changed files with 766 additions and 501 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,6 +14,15 @@
       "console": "integratedTerminal",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "args": ["${fileBasenameNoExtension}"]
+    },
+    {
+      "name": "Debug functions-v2 test",
+      "request": "launch",
+      "type": "node",
+      "console": "integratedTerminal",
+      "program": "${workspaceFolder}/functions-v2/node_modules/.bin/jest",
+      "args": ["${fileBasenameNoExtension}"],
+      "cwd": "${workspaceFolder}/functions-v2"
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -155,7 +155,6 @@ There are a number of URL parameters that can aid in testing:
 |`fakeClass`     |string                   |Class id for demo, qa, or test modes.|
 |`fakeUser`      |`(student\|teacher):<id>`|Configure user type and (optionally) id.|
 |`qaGroup`       |string                   |Group id for qa, e.g. automated tests.|
-|`qaClear`       |`all\|class\|offering`   |Extent of database clearing for automated tests.|
 |`firebase`      |`emulator\|<URL>`        |Target emulator for firebase realtime database calls.|
 |`firestore`     |`emulator\|<URL>`        |Target emulator for firestore database calls.|
 |`functions`     |`emulator\|<URL>`        |Target emulator-hosted firebase functions.|
@@ -183,11 +182,11 @@ The Standalone Document Editor also supports a `readOnly` url param. If you spec
 
 ### QA
 
-Along with `dev`, `test`, `authed` and `demo` modes the app has a `qa` mode.  QA mode uses the same parameters as demo mode with two additional parameters:
+Along with `dev`, `test`, `authed` and `demo` modes the app has a `qa` mode.  QA mode uses the same parameters as demo mode with one additional parameter:
 
-1. qaGroup - the group to automatically assign the fake user to after connecting to the database.
-2. qaClear - either "all", "class" or "offering".  When this parameter is present the QA database is cleared at the level requested based on the user parameters.
-   This is useful to clear data between automated QA runs.  When complete the app will display `<span className="qa-clear">QA Cleared: OK</span>`.
+qaGroup - the group to automatically assign the fake user to after connecting to the database.
+
+Additionally in `qa` mode the "root" in Firestore and the Realtime database is based on the Firebase user uid. This user is stored in session storage so each new tab will start a new root. In Cypress session storage is cleared between tests so each new test will have its own root.
 
 ### To run Cypress integration tests:
 - `npm run test:local`
@@ -209,7 +208,6 @@ implementation simpler. Existing commands at the moment:
 
     - setupGroup
     - upLoadFile
-    - clearQAData
 
 ## License
 

diff --git a/cypress/config/cypress.dev.json b/cypress/config/cypress.dev.json
diff --git a/cypress/config/cypress.local.json b/cypress/config/cypress.local.json
@@ -1,4 +1,5 @@
 {
     "baseUrl": "http://localhost:8080/",
-    "hideXHRInCommandLog": true
+    "hideXHRInCommandLog": true,
+    "defaultCommandTimeout": 5000
 }
diff --git a/cypress/e2e/cleanup/remove_teacher_comment_spec.js b/cypress/e2e/cleanup/remove_teacher_comment_spec.js
@@ -56,7 +56,6 @@ function beforePortalTest(url, clueTeacher, reportUrl) {
 
 function beforeTest() {
   const queryParams = `${Cypress.config("qaUnitTeacher6Network")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
   cy.openTopTab("problems");
@@ -78,7 +77,7 @@ describe('Delete Teacher Comments In chat panel', () => {
       // Teacher 1 tile comment
       chatPanel.deleteTeacherComments();
     });
-    
+
     cy.log("login teacher2 and setup clue chat");
     cy.logout(portalUrl);
     beforePortalTest(portalUrl, clueTeacher2, reportUrl2);
@@ -93,7 +92,7 @@ describe('Delete Teacher Comments In chat panel', () => {
       cy.clickProblemResourceTile(tab.sectionCode);
       // Teacher 2 tile comment
       chatPanel.deleteTeacherComments();
-    });  
+    });
   });
   it('Delete chat panel comment tags', () => {
     beforeTest();
@@ -102,7 +101,7 @@ describe('Delete Teacher Comments In chat panel', () => {
     cy.openTopTab("problems");
     cy.openProblemSection("Introduction");
     chatPanel.deleteTeacherComments();
-    
+
     cy.log('Delete comment tags on tile comment');
     cy.openTopTab("problems");
     cy.clickProblemResourceTile('introduction');

diff --git a/cypress/e2e/functional/document_tests/bookmark_test_spec.js b/cypress/e2e/functional/document_tests/bookmark_test_spec.js
@@ -12,7 +12,6 @@ const queryParams1 = `${Cypress.config("qaConfigSubtabsUnitStudent5")}`;
 const queryParams2 = `${Cypress.config("qaConfigSubtabsUnitTeacher1")}`;
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
 }
@@ -76,7 +75,7 @@ context('Bookmarks', function () {
     // resourcesPanel.getCanvasStarIcon('class-work', 'workspaces', copyDocumentTitle).should('have.class', 'starred');
     // cy.openSection('class-work', 'bookmarks');
     // resourcesPanel.getCanvasItemTitle('class-work', 'bookmarks').contains(copyDocumentTitle).should('exist');
-  })
+  });
   it('Test bookmarks for teacher', function () {
     beforeTest(queryParams1);
     let copyDocumentTitle = 'copy Investigation';
@@ -120,5 +119,5 @@ context('Bookmarks', function () {
     resourcesPanel.getCanvasStarIcon('class-work', 'workspaces', title).should('have.class', 'starred');
     cy.openSection('class-work', 'bookmarks');
     resourcesPanel.getCanvasItemTitle('class-work', 'bookmarks').contains(title).should('exist');
-  })
-})
+  });
+});
diff --git a/cypress/e2e/functional/document_tests/canvas_test_spec.js b/cypress/e2e/functional/document_tests/canvas_test_spec.js
@@ -28,7 +28,6 @@ const queryParams4 = "?appMode=demo&demoName=BrokenDocs&fakeClass=1&fakeUser=stu
 const title = "QA 1.1 Solving a Mystery with Proportional Reasoning";
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/copy_doc_test_spec.js b/cypress/e2e/functional/document_tests/copy_doc_test_spec.js
@@ -31,7 +31,6 @@ let canvas = new Canvas;
 
 function beforeTest() {
   const queryParams = `${Cypress.config("qaUnitStudent5")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/exemplar_test_spec.js b/cypress/e2e/functional/document_tests/exemplar_test_spec.js
@@ -18,7 +18,6 @@ const exemplarName = "First Exemplar";
 const exemplarInfo = "Ivan Idea: First Exemplar";
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/group_chooser_spec.js b/cypress/e2e/functional/document_tests/group_chooser_spec.js
@@ -20,10 +20,6 @@ const defaultSetupOptions = {
   problem
 };
 
-function beforeTest() {
-  cy.clearQAData('all');
-}
-
 function setup(student, opts = {}) {
   const options = { ...defaultSetupOptions, ...opts };
   cy.visit('/?appMode=qa&fakeClass=' + fakeClass + '&fakeUser=student:' + student + '&problem=' + options.problem + '&unit=./demo/units/qa/content.json');
@@ -40,8 +36,6 @@ function setup(student, opts = {}) {
 
 context('Test student join a group', function () {
   it('Test student join a group', function () {
-    beforeTest();
-
     cy.log('Student 1 will join and will verify Join Group Dialog comes up with welcome message to correct student');
     setup(student1);
     cy.get('.app > .join > .join-title').should('contain', 'Join Group');

diff --git a/cypress/e2e/functional/document_tests/group_test_readonly_spec.js b/cypress/e2e/functional/document_tests/group_test_readonly_spec.js
@@ -25,7 +25,6 @@ context('Test group functionalities', function () {
   it('4-up view read-only', function () {
 
     cy.log('students to check each others tiles in 4-up view read-only');
-    cy.clearQAData('all');
 
     setupTest(0);
     setupTest(1);

diff --git a/cypress/e2e/functional/document_tests/group_test_spec.js b/cypress/e2e/functional/document_tests/group_test_spec.js
@@ -45,7 +45,6 @@ context('Test group functionalities', function () {
   it('4-up view tests', function () {
 
     cy.log('will set up groups');
-    cy.clearQAData('all');
     setupTest(0);
     setupTest(1);
     setupTest(2);

diff --git a/cypress/e2e/functional/document_tests/header_test_spec.js b/cypress/e2e/functional/document_tests/header_test_spec.js
@@ -4,7 +4,6 @@ const header = new Header;
 
 function beforeTest() {
   const queryParams = `${Cypress.config("qaUnitStudent5")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/nav_panel_test_spec.js b/cypress/e2e/functional/document_tests/nav_panel_test_spec.js
@@ -17,7 +17,6 @@ const queryParams4 = `${Cypress.config("qaNoSectionProblemTabUnitStudent5")}`;
 const queryParams5 = `${Cypress.config("qaConfigSubtabsUnitStudent5")}`;
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/student_teacher_4up_readonly_spec.js b/cypress/e2e/functional/document_tests/student_teacher_4up_readonly_spec.js
@@ -144,8 +144,6 @@ function setupTestBrain(studentIndex) {
 context('Test 4-up and 1-up views tiles read only functionalities', function () {
   it('4-up and 1-up views read-only text, table, geometry, drawing, expression, numberline, image, datacard tiles', function () {
 
-    cy.clearQAData('all');
-
     setupTest(0);
     setupTest(1);
 
@@ -174,8 +172,6 @@ context('Test 4-up and 1-up views tiles read only functionalities', function ()
   });
   it('4-up and 1-up views read-only dataflow, expression, xy plot tiles', function () {
 
-    cy.clearQAData('all');
-
     setupTestBrain(0);
     setupTestBrain(1);
 

diff --git a/cypress/e2e/functional/document_tests/student_test_spec.js b/cypress/e2e/functional/document_tests/student_test_spec.js
@@ -12,7 +12,6 @@ let student = '5',
   group = '5';
 
 function beforeTest(queryParams) {
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/tiles_copy_test_spec.js b/cypress/e2e/functional/document_tests/tiles_copy_test_spec.js
@@ -54,7 +54,6 @@ const tiles2 = [
 ];
 
 function beforeTest(queryParams) {
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/document_tests/workspace_test_spec.js b/cypress/e2e/functional/document_tests/workspace_test_spec.js
@@ -6,7 +6,6 @@ let clueCanvas = new ClueCanvas,
 
 function beforeTest() {
   const queryParams = `${Cypress.config("qaUnitStudent5")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
 }

diff --git a/cypress/e2e/functional/teacher_tests/history_playback_spec.js b/cypress/e2e/functional/teacher_tests/history_playback_spec.js
@@ -17,7 +17,6 @@ function moveSliderTo(percent) {
 }
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
   clueCanvas.getInvestigationCanvasTitle().text().then((investigationTitle) => {

diff --git a/cypress/e2e/functional/teacher_tests/teacher_chat_spec.js b/cypress/e2e/functional/teacher_tests/teacher_chat_spec.js
@@ -34,7 +34,6 @@ const ss = [{ "section": "problems",
 const comment = [ "This is document comment for ", "This is tile comment for " ];
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
   cy.openTopTab("problems");
@@ -44,7 +43,6 @@ function beforeTest(params) {
 }
 
 function beforeTestCommentedDocumentList(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
   cy.openTopTab("my-work");

diff --git a/cypress/e2e/functional/teacher_tests/teacher_curation_spec.js b/cypress/e2e/functional/teacher_tests/teacher_curation_spec.js
@@ -12,7 +12,6 @@ const defaultProblemDocTitle = "QA 1.1 Solving a Mystery with Proportional Reaso
 
 function beforeTest() {
     const queryParams = `${Cypress.config("clueTestqaUnitTeacher6")}`;
-    cy.clearQAData('all');
     cy.visit(queryParams);
     cy.waitForLoad();
     dashboard.switchView("Workspace & Resources");

diff --git a/cypress/e2e/functional/teacher_tests/teacher_dashboard_4_quadrants_spec.js b/cypress/e2e/functional/teacher_tests/teacher_dashboard_4_quadrants_spec.js
@@ -4,7 +4,6 @@ let dashboard = new TeacherDashboard();
 
 function beforeTest() {
   const queryParams = `${Cypress.config("clueTestqaUnitTeacher6")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
   dashboard.switchView("Dashboard");

diff --git a/cypress/e2e/functional/teacher_tests/teacher_dashboard_spec.js b/cypress/e2e/functional/teacher_tests/teacher_dashboard_spec.js
@@ -6,7 +6,6 @@ let clueCanvas = new ClueCanvas;
 
 function beforeTest() {
   const queryParams = `${Cypress.config("clueTestqaUnitTeacher6")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
   dashboard.switchView("Dashboard");

diff --git a/cypress/e2e/functional/teacher_tests/teacher_network_spec.js b/cypress/e2e/functional/teacher_tests/teacher_network_spec.js
@@ -8,7 +8,6 @@ let teacherNetwork = new TeacherNetwork;
 
 function beforeTest() {
   const queryParams = `${Cypress.config("clueTestqaUnitTeacher6")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
   dashboard.switchView("Workspace & Resources");

diff --git a/cypress/e2e/functional/teacher_tests/teacher_share_spec.js b/cypress/e2e/functional/teacher_tests/teacher_share_spec.js
@@ -8,7 +8,6 @@ const teacherQueryParams = `${Cypress.config("qaConfigSubtabsUnitTeacher1")}`;
 const studentQueryParams = `${Cypress.config("qaConfigSubtabsUnitStudent5")}`;
 
 function beforeTest(params) {
-  cy.clearQAData('all');
   cy.visit(params);
   cy.waitForLoad();
   dashboard.switchView("Workspace & Resources");
@@ -23,48 +22,43 @@ function verifySwitch(publicOrPrivate) {
 function verifyStudentSeesAsPrivate() {
   cy.get('.tab-sort-work').click();
   cy.get('.section-header-arrow').click({multiple: true});
-  cy.get('.thumbnail-private').should('exist');
+  cy.contains('[data-test="sort-work-list-items"]','Teacher 1:')
+    .should('have.descendants', '.thumbnail-private');
 }
 
 function verifyStudentSeesAsPublic() {
   cy.get('.tab-sort-work').click();
   cy.get('.section-header-arrow').click({multiple: true});
-  cy.get('.thumbnail-public').should('not.exist');
+  cy.contains('[data-test="sort-work-list-items"]','Teacher 1:')
+    .should('not.have.descendants', '.thumbnail-private');
 }
 
 context('Teacher Sharing', function() {
-  describe('verify share functionality', function() {
-    it('loads teacher document as private', function() {
-      beforeTest(teacherQueryParams);
-      verifySwitch('private');
-    });
+  it('verify share functionality', function() {
+    cy.log('loads teacher document as private');
+    beforeTest(teacherQueryParams);
+    verifySwitch('private');
 
-    // TODO: Reinstate the tests below when all metadata documents have the new fields and are updated in real time.
-    it.skip('does not allow student to access private teacher document', function() {
-      cy.visit(studentQueryParams);
-      cy.waitForLoad();
-      verifyStudentSeesAsPrivate();
-    });
+    cy.log('does not allow student to access private teacher document');
+    cy.visit(studentQueryParams);
+    cy.waitForLoad();
+    verifyStudentSeesAsPrivate();
 
-    it('allows teacher to share a document', function() {
-      cy.visit(teacherQueryParams);
-      cy.waitForLoad();
-      clueCanvas.shareCanvas();
-      verifySwitch('public');
-    });
+    cy.log('allows teacher to share a document');
+    cy.visit(teacherQueryParams);
+    cy.waitForLoad();
+    clueCanvas.shareCanvas();
+    verifySwitch('public');
 
-    // TODO: Reinstate the tests below when all metadata documents have the new fields and are updated in real time.
-    it.skip('allows student to access public teacher document', function() {
-      cy.visit(studentQueryParams);
-      cy.waitForLoad();
-      verifyStudentSeesAsPublic();
-    });
+    cy.log('allows student to access public teacher document');
+    cy.visit(studentQueryParams);
+    cy.waitForLoad();
+    verifyStudentSeesAsPublic();
 
-    it('allows teacher to unshare a document', function() {
-      cy.visit(teacherQueryParams);
-      cy.waitForLoad();
-      clueCanvas.unshareCanvas();
-      verifySwitch('private');
-    });
+    cy.log('allows teacher to unshare a document');
+    cy.visit(teacherQueryParams);
+    cy.waitForLoad();
+    clueCanvas.unshareCanvas();
+    verifySwitch('private');
   });
 });
diff --git a/cypress/e2e/functional/teacher_tests/teacher_six_pack_spec.js b/cypress/e2e/functional/teacher_tests/teacher_six_pack_spec.js
@@ -4,7 +4,6 @@ let dashboard = new TeacherDashboard();
 
 function beforeTest() {
   const queryParams = `${Cypress.config("clueTestqaUnitTeacher6")}`;
-  cy.clearQAData('all');
   cy.visit(queryParams);
   cy.waitForLoad();
   dashboard.switchView("Dashboard");