20085: Fix tests

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/cypress/integration/group-manage.spec.js b/cypress/integration/group-manage.spec.js
index 1fd9e4165f502eb51fb06b8bf94f4c0071ae2eb4..c4731bb3c6bf01bdde33ccdb62cc57579c4531bc 100644 (file)
--- 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 c64f57fd2055841b50758a6a401e161508c7446d..5fbf5692f2b200e17c3aaa48b6731109b889e3fb 100644 (file)
--- 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 36447a8dabdc4e20aa15ac4c5906af32b15cd9d7..2fc4d01ad6e27b93819f079a4f0373c8ae6332be 100644 (file)
--- 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("<SharingDialogComponent />", () => {
             config: {
                 keepWebServiceUrl: 'http://example.com/',
                 keepWebInlineServiceUrl: 'http://*.collections.example.com/',
+                clusterConfig: {
+                    Users: {
+                        AnonymousUserToken: ""
+                    }
+                }
             }
         }
         store = createStore(combineReducers({
@@ -68,4 +73,4 @@ describe("<SharingDialogComponent />", () => {
         let wrapper = mount(<Provider store={store}><SharingDialogComponent {...props} /></Provider>);
         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 3ff98b0a291bd61b0e68f9d1cf7a97b621ba9307..871ea503ecee45b0281eeb0bdd81d12138130c9d 100644 (file)
--- 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'>
                     <Tooltip title="Add authorization">
                         <AddIcon />
                     </Tooltip>