16971: Fixed failing tests

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index d81ad811434e4c563f643de49a4a31576b203e9a..9f4e2b84c1444812cf8715a2ecc83216b9b7ef86 100644 (file)
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -135,22 +135,21 @@ describe('Favorites tests', function () {
     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();
 
@@ -159,14 +158,9 @@ describe('Favorites tests', function () {
                 const newCollectionName = `New collection name ${testTargetCollection.name}`;
                 const newCollectionDescription = `New collection description ${testTargetCollection.name}`;
 
-                cy.editProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription);
-                cy.editProjectOrCollection('main', testTargetCollection.name, newCollectionName, newCollectionDescription, false);
-
-                cy.get('main').contains(newProjectName).rightclick();
-                cy.contains('Remove from favorites').click();
-                cy.get('main').contains(newCollectionName).rightclick();
-                cy.contains('Remove from favorites').click();
-
+                cy.testEditProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription);
+                cy.testEditProjectOrCollection('main', testTargetCollection.name, newCollectionName, newCollectionDescription, false);
+                
                 cy.get('[data-cy=side-panel-tree]').contains('Projects').click();
 
                 cy.get('main').contains(newProjectName).rightclick();
@@ -176,8 +170,8 @@ describe('Favorites tests', function () {
 
                 cy.get('[data-cy=side-panel-tree]').contains('Public Favorites').click();
 
-                cy.editProjectOrCollection('main', newProjectName, mySharedWritableProject.name, 'newProjectDescription');
-                cy.editProjectOrCollection('main', newCollectionName, testTargetCollection.name, 'newCollectionDescription', false); 
+                cy.testEditProjectOrCollection('main', newProjectName, mySharedWritableProject.name, 'newProjectDescription');
+                cy.testEditProjectOrCollection('main', newCollectionName, testTargetCollection.name, 'newCollectionDescription', false); 
             });
     });
 

diff --git a/cypress/integration/sharing.spec.js b/cypress/integration/sharing.spec.js
index 4f4c2eb3b32f6974f629cff05d975f0362fbd404..c5664e3b89e272518c6591e204d6dc474d3323be 100644 (file)
--- a/cypress/integration/sharing.spec.js
+++ b/cypress/integration/sharing.spec.js
@@ -97,7 +97,7 @@ describe('Sharing tests', function () {
                 const newProjectName = `New project name ${mySharedWritableProject.name}`;
                 const newProjectDescription = `New project description ${mySharedWritableProject.name}`;
 
-                cy.editProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription);
+                cy.testEditProjectOrCollection('main', mySharedWritableProject.name, newProjectName, newProjectDescription);
             });
     });
 });
\ No newline at end of file

diff --git a/cypress/integration/side-panel.spec.js b/cypress/integration/side-panel.spec.js
index 2e31ec66cb040fc462bf80b48f365c290b842a5d..912e68ebfe229c394fdb7287226060f39956202f 100644 (file)
--- a/cypress/integration/side-panel.spec.js
+++ b/cypress/integration/side-panel.spec.js
@@ -110,7 +110,7 @@ describe('Side panel tests', function() {
                 const newProjectName = `New project name ${mySharedWritableProject.name}`;
                 const newProjectDescription = `New project description ${mySharedWritableProject.name}`;
 
-                cy.editProjectOrCollection('[data-cy=side-panel-tree]', mySharedWritableProject.name, newProjectName, newProjectDescription);
+                cy.testEditProjectOrCollection('[data-cy=side-panel-tree]', mySharedWritableProject.name, newProjectName, newProjectDescription);
             });
     });
 

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 97bb2450909566ca0a964ffcc8edaa03adec28c9..069ed96dcf3631afec10e55478f6f635f96b6d4b 100644 (file)
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -193,12 +193,12 @@ Cypress.Commands.add(
 )
 
 Cypress.Commands.add(
-    "editProjectOrCollection", (container, oldName, newName, newDescription, isProject = true) => {
+    "testEditProjectOrCollection", (container, oldName, newName, newDescription, isProject = true) => {
         cy.get(container).contains(oldName).rightclick();
         cy.get('[data-cy=context-menu]').contains(isProject ? 'Edit project' : 'Edit collection').click();
         cy.get('[data-cy=form-dialog]').within(() => {
             cy.get('input[name=name]').clear().type(newName);
-            cy.get(isProject ? 'div[contenteditable=true]' : 'input[name=description]').type(newDescription);
+            cy.get(isProject ? 'div[contenteditable=true]' : 'input[name=description]').clear().type(newDescription);
             cy.get('[data-cy=form-submit-btn]').click();
         });