X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7bbd67535b2ee9e8abd3342d5a9de5a22ef786a3..852a6a393297d03ca5259ddb6aa7aedff4a000ea:/cypress/integration/favorites.spec.js

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index 1f8fe41c..7fd09124 100644
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -44,7 +44,8 @@ describe('Favorites tests', function () {
         });
     });
 
-    it('can copy selected into the collection', () => {
+    // Disabled while addressing #18587
+    it.skip('can copy selected into the collection', () => {
         cy.createCollection(adminUser.token, {
             name: `Test source collection ${Math.floor(Math.random() * 999999)}`,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
@@ -63,7 +64,7 @@ describe('Favorites tests', function () {
                 cy.loginAs(activeUser);
                 cy.goToPath(`/collections/${testSourceCollection.uuid}`);
                 cy.get('[data-cy=collection-files-panel]').contains('bar');
-                cy.get('[data-cy=collection-files-panel]').find('input[type=checkbox]').click({ force: true });
+                cy.get('[data-cy=collection-files-panel]').find('input[type=checkbox]').click();
                 cy.get('[data-cy=collection-files-panel-options-btn]').click();
                 cy.get('[data-cy=context-menu]')
                     .contains('Copy selected into the collection').click();
@@ -132,66 +133,46 @@ describe('Favorites tests', function () {
             });
     });
 
-    it.only('can edit project in favorites', () => {
+    it('can edit project and collections in favorites', () => {
         cy.createProject({
             owningUser: adminUser,
-            targetUser: activeUser,
             projectName: 'mySharedWritableProject',
             canWrite: true,
             addToFavorites: true
         });
 
         cy.createCollection(adminUser.token, {
-            owner_uuid: activeUser.user.uuid,
+            owner_uuid: adminUser.user.uuid,
             name: `Test target collection ${Math.floor(Math.random() * 999999)}`,
         }).as('testTargetCollection').then(function (testTargetCollection) {
-            cy.addToFavorites(activeUser.token, activeUser.user.uuid, testTargetCollection.uuid);
+            cy.addToFavorites(adminUser.token, adminUser.user.uuid, testTargetCollection.uuid);
         });
 
-
-
         cy.getAll('@mySharedWritableProject', '@testTargetCollection')
             .then(function ([mySharedWritableProject, testTargetCollection]) {
-                cy.loginAs(activeUser);
+                cy.loginAs(adminUser);
+
+                cy.get('[data-cy=side-panel-tree]').contains('My Favorites').click();
 
                 const newProjectName = `New project name ${mySharedWritableProject.name}`;
                 const newProjectDescription = `New project description ${mySharedWritableProject.name}`;
                 const newCollectionName = `New collection name ${testTargetCollection.name}`;
                 const newCollectionDescription = `New collection description ${testTargetCollection.name}`;
 
-                cy.get('[data-cy=side-panel-tree]').contains('My Favorites').click();
+                cy.testEditProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription);
+                cy.testEditProjectOrCollection('main', testTargetCollection.name, newCollectionName, newCollectionDescription, false);
 
-                cy.get('main').contains(mySharedWritableProject.name).rightclick();
-                cy.get('[data-cy=context-menu]').contains('Edit project').click();
-                cy.get('[data-cy=form-dialog]').within(() => {
-                    cy.get('input[name=name]').clear().type(newProjectName);
-                    cy.get('div[contenteditable=true]').type(newProjectDescription);
-                    cy.get('[data-cy=form-submit-btn]').click();
-                });
+                cy.get('[data-cy=side-panel-tree]').contains('Projects').click();
 
                 cy.get('main').contains(newProjectName).rightclick();
-                cy.get('[data-cy=context-menu]').contains('Edit project').click();
-                cy.get('[data-cy=form-dialog]').within(() => {
-                    cy.get('input[name=name]').should('have.value', newProjectName);
-                    cy.get('span[data-text=true]').contains( newProjectDescription);
-                    cy.get('[data-cy=form-cancel-btn]').click();
-                });
+                cy.contains('Add to public favorites').click();
+                cy.get('main').contains(newCollectionName).rightclick();
+                cy.contains('Add to public favorites').click();
 
-                cy.get('main').contains(testTargetCollection.name).rightclick();
-                cy.get('[data-cy=context-menu]').contains('Edit collection').click();
-                cy.get('[data-cy=form-dialog]').within(() => {
-                    cy.get('input[name=name]').clear().type(newCollectionName);
-                    cy.get('input[name=description]').type(newCollectionDescription);
-                    cy.get('[data-cy=form-submit-btn]').click();
-                });
+                cy.get('[data-cy=side-panel-tree]').contains('Public Favorites').click();
 
-                cy.get('main').contains(newCollectionName).rightclick();
-                cy.get('[data-cy=context-menu]').contains('Edit collection').click();
-                cy.get('[data-cy=form-dialog]').within(() => {
-                    cy.get('input[name=name]').should('have.value', newCollectionName);
-                    cy.get('input[name=description]').should('have.value', newCollectionDescription);
-                    cy.get('[data-cy=form-cancel-btn]').click();
-                });
+                cy.testEditProjectOrCollection('main', newProjectName, mySharedWritableProject.name, 'newProjectDescription');
+                cy.testEditProjectOrCollection('main', newCollectionName, testTargetCollection.name, 'newCollectionDescription', false);
             });
     });
 
@@ -238,13 +219,16 @@ describe('Favorites tests', function () {
 
                 cy.get('[data-cy=side-panel-button]').click();
 
-                cy.get('#aside-menu-list').contains('Run a process').click();
+                cy.get('#aside-menu-list').contains('Run a workflow').click();
 
                 cy.get('@testWorkflow')
                     .then((testWorkflow) => {
                         cy.get('main').contains(testWorkflow.name).click();
                         cy.get('[data-cy=run-process-next-button]').click();
-                        cy.get('[readonly]').click();
+                        cy.get('[data-cy=new-process-panel]')
+                            .within(() => {
+                                cy.contains('input').next().click();
+                            });
                         cy.get('[data-cy=choose-a-file-dialog]').as('chooseFileDialog');
                         cy.get('[data-cy=projects-tree-favourites-tree-picker]').contains('Favorites').closest('ul').find('i').click();
                         cy.get('@chooseFileDialog').find(`[data-id=${mySharedWritableProject.uuid}]`);
@@ -259,7 +243,10 @@ describe('Favorites tests', function () {
                         cy.get('main').contains(testWorkflow2.name).click();
                         cy.get('button').contains('Change Workflow').click();
                         cy.get('[data-cy=run-process-next-button]').click();
-                        cy.get('[readonly]').click();
+                        cy.get('[data-cy=new-process-panel]')
+                            .within(() => {
+                                cy.contains('image_collection').next().click();
+                            });
                         cy.get('[data-cy=choose-a-directory-dialog]').as('chooseDirectoryDialog');
                         cy.get('[data-cy=projects-tree-favourites-tree-picker]').contains('Favorites').closest('ul').find('i').click();
                         cy.get('@chooseDirectoryDialog').find(`[data-id=${mySharedWritableProject.uuid}]`);