Merge branch 'main' into backport_upgrade

opensearch-project · Jul 21, 2023 · 225a494 · 225a494
2 parents 86ae136 + 8bde066
commit 225a494
Show file tree

Hide file tree

Showing 4 changed files with 261 additions and 2,436 deletions.
diff --git a/.cypress/integration/channels.spec.js b/.cypress/integration/channels.spec.js
@@ -98,7 +98,7 @@ describe('Test create channels', () => {
     cy.wait(delay);
     cy.get(
       '[data-test-subj="create-recipient-group-modal-create-button"]'
-    ).click();
+    ).click({ force: true });
     cy.contains('successfully created.').should('exist');
 
     cy.get('[data-test-subj="create-channel-create-button"]').click();
@@ -135,7 +135,7 @@ describe('Test create channels', () => {
     );
     cy.get(
       '[data-test-subj="create-ses-sender-modal-create-button"]'
-    ).click();
+    ).click({ force: true });
     cy.contains('successfully created.').should('exist');
 
     // custom data-test-subj does not work on combo box
@@ -182,7 +182,7 @@ describe('Test create channels', () => {
       'arn:aws:iam::012345678901:role/NotificationsSNSRole'
     );
 
-    cy.get('[data-test-subj="create-channel-create-button"]').click();
+    cy.get('[data-test-subj="create-channel-create-button"]').click({ force: true });
     cy.contains('successfully created.').should('exist');
   });
 });

diff --git a/.cypress/support/commands.js b/.cypress/support/commands.js
@@ -83,6 +83,11 @@ Cypress.Commands.add('createTestEmailChannel', () => {
 });
 
 Cypress.Commands.add('deleteAllConfigs', () => {
+  cy.request({
+    method: 'POST',
+    url: `${Cypress.env('opensearch')}/_refresh`
+  });
+
   cy.request({
     method: 'GET',
     url: `${Cypress.env('opensearch')}${API.CONFIGS_BASE}`,

diff --git a/package.json b/package.json
@@ -21,17 +21,17 @@
     "postbuild": "echo Renaming build artifact to [$npm_package_config_zip_name-$npm_package_version.zip] && mv build/$npm_package_config_id*.zip build/$npm_package_config_zip_name-$npm_package_version.zip"
   },
   "dependencies": {
-    "cypress": "^6.0.0"
   },
   "devDependencies": {
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/showdown": "^1.9.3",
     "enzyme-adapter-react-16": "^1.15.5",
-    "jest": "^27.5.1",
-    "jest-dom": "^4.0.0"
+    "jest-dom": "^4.0.0",
+    "cypress": "^6.0.0"
   },
   "resolutions": {
     "async": "^3.2.3",
-    "minimist": "^1.2.6"
+    "minimist": "^1.2.6",
+    "tough-cookie": "^4.1.3"
   }
 }