Skip to content

Commit 6f59d36

Browse files
author
Aditi Chaudhry
committed
Fix ISM e2e tests for OS 2.5: conditional toast dismiss and failOnStatusCode
Signed-off-by: Aditi Chaudhry <aditiac@amazon.com>
1 parent 9c31f91 commit 6f59d36

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

cypress/integration/plugins/index-management-dashboards-plugin/indices_spec.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,15 @@ describe('Indices', () => {
428428
// Check for Shrink page
429429
cy.contains('Shrink index');
430430

431+
// Dismiss any toast that may overlay the form
432+
cy.get('body').then(($body) => {
433+
if ($body.find('[data-test-subj="toastCloseButton"]').length) {
434+
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
435+
}
436+
});
437+
431438
// Enter target index name
432-
cy.get(`input[data-test-subj="targetIndexNameInput"]`).type(
439+
cy.get(`input[data-test-subj="targetIndexNameInput"]`, { timeout: 120000 }).type(
433440
`${SAMPLE_INDEX}_shrunken`
434441
);
435442

cypress/integration/plugins/index-management-dashboards-plugin/managed_indices_spec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('Managed indices', () => {
2929
// Common text to wait for to confirm page loaded, give up to 60 seconds for initial load
3030
cy.contains('Edit rollover alias', { timeout: 60000 });
3131

32-
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
32+
cy.get('body').then(($body) => { if ($body.find('[data-test-subj="toastCloseButton"]').length) { cy.get('[data-test-subj="toastCloseButton"]').click({ force: true }); } });
3333
});
3434

3535
describe('can have policies removed', () => {
@@ -90,7 +90,7 @@ describe('Managed indices', () => {
9090
// Wait up to 5 seconds for the managed index to execute
9191
// eslint-disable-next-line cypress/no-unnecessary-waiting
9292
cy.wait(5000).reload();
93-
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
93+
cy.get('body').then(($body) => { if ($body.find('[data-test-subj="toastCloseButton"]').length) { cy.get('[data-test-subj="toastCloseButton"]').click({ force: true }); } });
9494

9595
// Confirm managed index successfully initialized the policy
9696
cy.contains('Successfully initialized', { timeout: 20000 });
@@ -100,7 +100,7 @@ describe('Managed indices', () => {
100100
// Wait up to 5 seconds for managed index to execute
101101
// eslint-disable-next-line cypress/no-unnecessary-waiting
102102
cy.wait(5000).reload();
103-
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
103+
cy.get('body').then(($body) => { if ($body.find('[data-test-subj="toastCloseButton"]').length) { cy.get('[data-test-subj="toastCloseButton"]').click({ force: true }); } });
104104

105105
// Confirm we have a Failed execution, wait up to 20 seconds as OSD takes a while to load
106106
cy.contains('Failed', { timeout: 20000 });
@@ -127,7 +127,7 @@ describe('Managed indices', () => {
127127

128128
// Reload the page
129129
cy.reload();
130-
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
130+
cy.get('body').then(($body) => { if ($body.find('[data-test-subj="toastCloseButton"]').length) { cy.get('[data-test-subj="toastCloseButton"]').click({ force: true }); } });
131131

132132
// Confirm we see managed index attempting to retry, give 20 seconds for OSD load
133133
cy.contains('Pending retry of failed managed index', { timeout: 20000 });
@@ -138,7 +138,7 @@ describe('Managed indices', () => {
138138
// Wait up to 5 seconds for managed index to execute
139139
// eslint-disable-next-line cypress/no-unnecessary-waiting
140140
cy.wait(5000).reload();
141-
cy.get('[data-test-subj="toastCloseButton"]').click({ force: true });
141+
cy.get('body').then(($body) => { if ($body.find('[data-test-subj="toastCloseButton"]').length) { cy.get('[data-test-subj="toastCloseButton"]').click({ force: true }); } });
142142

143143
// Confirm managed index successfully rolled over
144144
cy.contains('Successfully rolled over', { timeout: 20000 });

cypress/utils/commands.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,13 @@ Cypress.Commands.add('login', () => {
9898

9999
Cypress.Commands.add('deleteAllIndices', () => {
100100
cy.log('Deleting all indices');
101-
cy.request(
102-
'DELETE',
103-
`${Cypress.env(
101+
cy.request({
102+
method: 'DELETE',
103+
url: `${Cypress.env(
104104
'openSearchUrl'
105-
)}/index*,sample*,opensearch_dashboards*,test*,cypress*`
106-
);
105+
)}/index*,sample*,opensearch_dashboards*,test*,cypress*`,
106+
failOnStatusCode: false,
107+
});
107108
});
108109

109110
Cypress.Commands.add('deleteADSystemIndices', () => {

0 commit comments

Comments
 (0)