From: Daniel Kutyła Date: Wed, 30 Jun 2021 13:55:45 +0000 (+0200) Subject: 16971: Added more tests X-Git-Tag: 2.2.1^2~3 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/7bbd67535b2ee9e8abd3342d5a9de5a22ef786a3 16971: Added more tests Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index 506cd251..1f8fe41c 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 6d8aef74..800f57d9 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(openProjectUpdateDialog(resource)); } }, diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index 23b0c005..dcae6807 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(resourceUuidToContextMenuKind(resourceUuid, readonly)); if (menuKind&& resource) { - // this.props.dispatch(openContextMenu(event, { - // name: '', - // uuid: resourceUuid, - // ownerUuid: '', - // kind: ResourceKind.NONE, - // menuKind - // })); this.props.dispatch(openContextMenu(event, { name: resource.name, uuid: resource.uuid,