From 0fdae1ff782d3ca3b98038b54c1147f3aca3bca1 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 4 Apr 2023 15:03:37 -0400 Subject: [PATCH] 20085: Fix tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- cypress/integration/group-manage.spec.js | 2 +- cypress/integration/sharing.spec.js | 12 ++++++------ .../sharing-dialog/sharing-dialog-component.test.tsx | 7 ++++++- .../sharing-invitation-form-component.tsx | 3 ++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cypress/integration/group-manage.spec.js b/cypress/integration/group-manage.spec.js index 1fd9e416..c4731bb3 100644 --- a/cypress/integration/group-manage.spec.js +++ b/cypress/integration/group-manage.spec.js @@ -77,7 +77,7 @@ describe('Group manage tests', function() { cy.get('[data-cy=invite-people-field] input').type("admin"); }); cy.get('[role=tooltip]').click(); - cy.get('.sharing-dialog').contains('Save').click(); + cy.get('.sharing-dialog').get('[data-cy=add-invited-people]').click(); cy.get('.sharing-dialog').contains('Close').click(); // Check that both users are present with appropriate permissions diff --git a/cypress/integration/sharing.spec.js b/cypress/integration/sharing.spec.js index c64f57fd..5fbf5692 100644 --- a/cypress/integration/sharing.spec.js +++ b/cypress/integration/sharing.spec.js @@ -77,7 +77,7 @@ describe('Sharing tests', function () { cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email); cy.get('[role=tooltip]').click(); cy.get('@sharingDialog').within(() => { - cy.contains('Save changes').click(); + cy.get('[data-cy=add-invited-people]').click(); cy.contains('Close').click(); }); }); @@ -95,7 +95,7 @@ describe('Sharing tests', function () { cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email); cy.get('[role=tooltip]').click(); cy.get('@sharingDialog').within(() => { - cy.contains('Save changes').click(); + cy.get('[data-cy=add-invited-people]').click(); cy.contains('Close').click(); }); }); @@ -153,12 +153,12 @@ describe('Sharing tests', function () { cy.loginAs(adminUser); cy.get('[data-cy=project-panel]').contains(collName).rightclick(); cy.get('[data-cy=context-menu]').contains('Share').click(); - cy.get('button').contains('Save changes').parent().should('be.disabled'); + cy.get('button').get('[data-cy=add-invited-people]').should('be.disabled'); cy.get('[data-cy=invite-people-field] input').type('Anonymous'); cy.get('div[role=tooltip]').contains('anonymous').click(); - cy.get('button').contains('Save changes').parent().should('not.be.disabled'); + cy.get('button').get('[data-cy=add-invited-people]').should('not.be.disabled'); cy.get('[data-cy=invite-people-field] div[role=button]').contains('anonymous').parent().find('svg').click(); - cy.get('button').contains('Save changes').parent().should('be.disabled'); + cy.get('button').get('[data-cy=add-invited-people]').should('be.disabled'); }); }); -}); \ No newline at end of file +}); diff --git a/src/views-components/sharing-dialog/sharing-dialog-component.test.tsx b/src/views-components/sharing-dialog/sharing-dialog-component.test.tsx index 36447a8d..2fc4d01a 100644 --- a/src/views-components/sharing-dialog/sharing-dialog-component.test.tsx +++ b/src/views-components/sharing-dialog/sharing-dialog-component.test.tsx @@ -27,6 +27,11 @@ describe("", () => { config: { keepWebServiceUrl: 'http://example.com/', keepWebInlineServiceUrl: 'http://*.collections.example.com/', + clusterConfig: { + Users: { + AnonymousUserToken: "" + } + } } } store = createStore(combineReducers({ @@ -68,4 +73,4 @@ describe("", () => { let wrapper = mount(); expect(wrapper.html()).not.toContain('Sharing URLs'); }); -}); \ No newline at end of file +}); diff --git a/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx b/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx index 3ff98b0a..871ea503 100644 --- a/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx +++ b/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx @@ -53,7 +53,8 @@ const StyledSharingInvitationFormComponent = withStyles(styles)( root: classes.addButtonRoot, colorPrimary: classes.addButtonPrimary, disabled: classes.addButtonDisabled - }}> + }} + data-cy='add-invited-people'> -- 2.30.2