Merge branch 'master' into 183810075-cycle-through-workspaces-in-sort…

…-view

cypress/config/cypress.local.json

@@ -1,4 +1,5 @@
 {
     "baseUrl": "http://localhost:8080/",
-    "hideXHRInCommandLog": true
+    "hideXHRInCommandLog": true,
+    "defaultCommandTimeout": 5000
 }

cypress/e2e/functional/teacher_tests/teacher_sort_work_view_spec.js

@@ -211,8 +211,7 @@ describe('SortWorkView Tests', () => {
 
   });
 
-  // TODO: Reinstate the tests below when all metadata documents have the new fields and are being updated in real time.
-  it.skip("should open Sort Work tab and test sorting by group", () => {
+  it("should open Sort Work tab and test sorting by group", () => {
 
     const students = ["student:1", "student:2", "student:3", "student:4"];
     const studentProblemDocs = [
@@ -336,15 +335,20 @@ describe('SortWorkView Tests', () => {
     sortWork.getSortWorkItem().contains(exemplarDocs[0]).click();
     chatPanel.getChatPanelToggle().click();
     chatPanel.addCommentTagAndVerify("Diverging Designs");
+    // FIXME: at the moment it is necessary to comment the document twice.
+    // Search for "exemplar" in document-comment-hooks.ts for an explanation.
+    cy.wait(100);
+    chatPanel.addCommentTagAndVerify("Diverging Designs");
 
     cy.log("check that exemplar document is displayed in new tag");
     chatPanel.getChatCloseButton().click();
     cy.openTopTab('sort-work');
     // at the moment this is required to refresh the sort
-    sortWork.getPrimarySortByMenu().click();
-    sortWork.getPrimarySortByNameOption().click();
-    sortWork.getPrimarySortByMenu().click();
-    sortWork.getPrimarySortByTagOption().click();
+    sortWork.getShowForMenu().click();
+    sortWork.getShowForInvestigationOption().click();
+    sortWork.getShowForMenu().click();
+    sortWork.getShowForProblemOption().click();
+
     cy.get('.section-header-arrow').click({multiple: true}); // Open the sections
     sortWork.checkDocumentInGroup("Diverging Designs", exemplarDocs[0]);
 
@@ -362,7 +366,12 @@ describe('SortWorkView Tests', () => {
     sortWork.getPrimarySortByTagOption().click();
     cy.get('.section-header-arrow').click({multiple: true}); // Open the sections
     sortWork.checkDocumentInGroup("Unit Rate", exemplarDocs[0]);
-    sortWork.checkGroupIsEmpty("Diverging Designs");
+
+    // FIXME: We haven't implemented support for deleting comments
+    // what should be true:
+    // sortWork.checkGroupIsEmpty("Diverging Designs");
+    // what currently happens
+    sortWork.checkDocumentInGroup("Diverging Designs", exemplarDocs[0]);
 
     cy.log("run CLUE as a student:1 and join group 6");
     runClueAsStudent(students[0], 6);