Merge branch '21225-project-panel-tabs' into main. Closes #21225

[arvados.git] / services / workbench2 / cypress / e2e / project.cy.js

diff --git a/services/workbench2/cypress/e2e/project.cy.js b/services/workbench2/cypress/e2e/project.cy.js
index 4aeb59bc75ef4d8cfe79a6e187e3e12411fdcf5e..3b2237bbceefb2b5733ac92ffe3324a1a482a247 100644 (file)
--- a/services/workbench2/cypress/e2e/project.cy.js
+++ b/services/workbench2/cypress/e2e/project.cy.js
@@ -219,18 +219,18 @@ describe("Project tests", function () {
     it('shows the appropriate buttons in the multiselect toolbar', () => {
 
         const msButtonTooltips = [
+            'View details',
+            'Open in new tab',
+            'Copy link to clipboard',
+            'Open with 3rd party client',
             'API Details',
-            'Add to Favorites',
-            'Copy to clipboard',
+            'Share',
+            'New project',
             'Edit project',
-            'Freeze Project',
             'Move to',
             'Move to trash',
-            'New project',
-            'Open in new tab',
-            'Open with 3rd party client',
-            'Share',
-            'View details',
+            'Freeze project',
+            'Add to favorites',
         ];
 
         cy.loginAs(activeUser);
@@ -636,7 +636,7 @@ describe("Project tests", function () {
         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.get("[data-cy=context-menu]").contains("Copy link to clipboard").click();
         cy.window().then(win =>
             win.navigator.clipboard.readText().then(text => {
                 expect(text).to.match(/https\:\/\/127\.0\.0\.1\:[0-9]+\/projects\/[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}/);
@@ -657,28 +657,28 @@ describe("Project tests", function () {
         [
             {
                 name: "Name",
-                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",
+                asc: "collections.name asc,groups.name asc,workflows.name asc,created_at desc",
+                desc: "collections.name desc,groups.name desc,workflows.name desc,created_at desc",
             },
             {
                 name: "Last Modified",
-                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",
+                asc: "collections.modified_at asc,groups.modified_at asc,workflows.modified_at asc,created_at desc",
+                desc: "collections.modified_at desc,groups.modified_at desc,workflows.modified_at desc,created_at desc",
             },
             {
                 name: "Date Created",
-                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",
+                asc: "collections.created_at asc,groups.created_at asc,workflows.created_at asc,created_at desc",
+                desc: "collections.created_at desc,groups.created_at desc,workflows.created_at desc,created_at desc",
             },
             {
                 name: "Trash at",
-                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",
+                asc: "collections.trash_at asc,groups.trash_at asc,workflows.trash_at asc,created_at desc",
+                desc: "collections.trash_at desc,groups.trash_at desc,workflows.trash_at desc,created_at desc",
             },
             {
                 name: "Delete at",
-                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",
+                asc: "collections.delete_at asc,groups.delete_at asc,workflows.delete_at asc,created_at desc",
+                desc: "collections.delete_at desc,groups.delete_at desc,workflows.delete_at desc,created_at desc",
             },
         ].forEach(test => {
             cy.get("[data-cy=project-panel] table thead th").contains(test.name).click();