From 7bbd67535b2ee9e8abd3342d5a9de5a22ef786a3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Kuty=C5=82a?= <daniel.kutyla@contractors.roche.com>
Date: Wed, 30 Jun 2021 15:55:45 +0200
Subject: [PATCH] 16971: Added more tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---
 cypress/integration/favorites.spec.js         | 30 +++++++++++++++++--
 .../action-sets/project-action-set.ts         |  1 -
 src/views/favorite-panel/favorite-panel.tsx   |  7 -----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index 506cd251e9..1f8fe41cbe 100644
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -137,7 +137,6 @@ describe('Favorites tests', function () {
             owningUser: adminUser,
             targetUser: activeUser,
             projectName: 'mySharedWritableProject',
-            description: 'test 123123',
             canWrite: true,
             addToFavorites: true
         });
@@ -149,23 +148,48 @@ describe('Favorites tests', function () {
             cy.addToFavorites(activeUser.token, activeUser.user.uuid, testTargetCollection.uuid);
         });
 
+
+
         cy.getAll('@mySharedWritableProject', '@testTargetCollection')
             .then(function ([mySharedWritableProject, testTargetCollection]) {
                 cy.loginAs(activeUser);
 
+                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.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]').should('have.value', mySharedWritableProject.name);
+                    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('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.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]').should('have.value', testTargetCollection.name);
+                    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('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();
                 });
             });
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 6d8aef74d1..800f57d9f5 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -73,7 +73,6 @@ export const filterGroupActionSet: ContextMenuActionSet = [
             icon: RenameIcon,
             name: "Edit project",
             execute: (dispatch, resource) => {
-                console.log(resource);
                 dispatch<any>(openProjectUpdateDialog(resource));
             }
         },
diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx
index 23b0c0056a..dcae68074a 100644
--- a/src/views/favorite-panel/favorite-panel.tsx
+++ b/src/views/favorite-panel/favorite-panel.tsx
@@ -152,13 +152,6 @@ export const FavoritePanel = withStyles(styles)(
                 const menuKind = this.props.dispatch<any>(resourceUuidToContextMenuKind(resourceUuid, readonly));
 
                 if (menuKind&& resource) {
-                    // this.props.dispatch<any>(openContextMenu(event, {
-                    //     name: '',
-                    //     uuid: resourceUuid,
-                    //     ownerUuid: '',
-                    //     kind: ResourceKind.NONE,
-                    //     menuKind
-                    // }));
                     this.props.dispatch<any>(openContextMenu(event, {
                         name: resource.name,
                         uuid: resource.uuid,
-- 
2.30.2