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

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index 1f8fe41c..9bc90ebd 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"
@@ -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);
             });
     });