Merge branch 'main' into 19302-left-side-panel-changes

[arvados-workbench2.git] / cypress / integration / project.spec.js

diff --git a/cypress/integration/project.spec.js b/cypress/integration/project.spec.js
index f0de6f862221b5cee6bd7963fe9d00c2fc2dc1cb..a8663d862261bdd51b1be0c353c2ba9ad1a363be 100644 (file)
--- a/cypress/integration/project.spec.js
+++ b/cypress/integration/project.spec.js
@@ -136,6 +136,7 @@ describe("Project tests", function () {
                 });
             });
         cy.get("[data-cy=form-submit-btn]").click();
+        cy.get("[data-cy=form-dialog]").should("not.exist");
 
         const editProjectDescription = (name, type) => {
             cy.get("[data-cy=side-panel-tree]").contains("Home Projects").click();
@@ -550,17 +551,20 @@ describe("Project tests", function () {
                 cy.get("[data-cy=form-submit-btn]").click();
             });
         cy.get("[data-cy=form-dialog]").should("not.exist");
+        cy.get("[data-cy=snackbar]").contains("created");
+        cy.get("[data-cy=snackbar]").should("not.exist");
         cy.get("[data-cy=side-panel-tree]").contains("Projects").click();
+        cy.waitForDom();
         cy.get("[data-cy=project-panel]").contains(projectName).should("be.visible").rightclick();
         cy.get("[data-cy=context-menu]").contains("Copy to clipboard").click();
         cy.window().then(win =>
             win.navigator.clipboard.readText().then(text => {
-                expect(text).to.match(/https\:\/\/localhost\:[0-9]+\/projects\/[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}/);
+                expect(text).to.match(/https\:\/\/127\.0\.0\.1\:[0-9]+\/projects\/[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}/);
             })
         );
     });
 
-    it("sorts displayed items correctly", () => {
+    it.only("sorts displayed items correctly", () => {
         cy.loginAs(activeUser);
 
         cy.get('[data-cy=project-panel] button[title="Select columns"]').click();
@@ -573,28 +577,28 @@ describe("Project tests", function () {
         [
             {
                 name: "Name",
-                asc: "collections.name asc,container_requests.name asc,groups.name asc",
-                desc: "collections.name desc,container_requests.name desc,groups.name desc",
+                asc: "collections.name asc,container_requests.name asc,groups.name asc,container_requests.created_at desc",
+                desc: "collections.name desc,container_requests.name desc,groups.name desc,container_requests.created_at desc",
             },
             {
                 name: "Last Modified",
-                asc: "collections.modified_at asc,container_requests.modified_at asc,groups.modified_at asc",
-                desc: "collections.modified_at desc,container_requests.modified_at desc,groups.modified_at desc",
+                asc: "collections.modified_at asc,container_requests.modified_at asc,groups.modified_at asc,container_requests.created_at desc",
+                desc: "collections.modified_at desc,container_requests.modified_at desc,groups.modified_at desc,container_requests.created_at desc",
             },
             {
                 name: "Date Created",
-                asc: "collections.created_at asc,container_requests.created_at asc,groups.created_at asc",
-                desc: "collections.created_at desc,container_requests.created_at desc,groups.created_at desc",
+                asc: "collections.created_at asc,container_requests.created_at asc,groups.created_at asc,container_requests.created_at desc",
+                desc: "collections.created_at desc,container_requests.created_at desc,groups.created_at desc,container_requests.created_at desc",
             },
             {
                 name: "Trash at",
-                asc: "collections.trash_at asc,container_requests.trash_at asc,groups.trash_at asc",
-                desc: "collections.trash_at desc,container_requests.trash_at desc,groups.trash_at desc",
+                asc: "collections.trash_at asc,container_requests.trash_at asc,groups.trash_at asc,container_requests.created_at desc",
+                desc: "collections.trash_at desc,container_requests.trash_at desc,groups.trash_at desc,container_requests.created_at desc",
             },
             {
                 name: "Delete at",
-                asc: "collections.delete_at asc,container_requests.delete_at asc,groups.delete_at asc",
-                desc: "collections.delete_at desc,container_requests.delete_at desc,groups.delete_at desc",
+                asc: "collections.delete_at asc,container_requests.delete_at asc,groups.delete_at asc,container_requests.created_at desc",
+                desc: "collections.delete_at desc,container_requests.delete_at desc,groups.delete_at desc,container_requests.created_at desc",
             },
         ].forEach(test => {
             cy.get("[data-cy=project-panel] table thead th").contains(test.name).click();