Update 2.4, TODO rollups_spec, remove 'wait' when possible snapshots_…

…spec

Signed-off-by: Chris Hesterman <phestech@amazon.com>

.github/workflows/cypress-workflow.yml

@@ -7,8 +7,8 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.3.0'
-  OPENSEARCH_VERSION: '2.3.0-SNAPSHOT'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_VERSION: '2.4.0-SNAPSHOT'
 jobs:
   tests:
     name: Run Cypress E2E tests

.github/workflows/unit-tests-workflow.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.3'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
 jobs:
   tests:
     name: Run unit tests

cypress/integration/rollups_spec.js

@@ -18,11 +18,14 @@ describe("Rollups", () => {
 
     cy.wait(10000)
 
-    // // Click on "Sample data" tab
-    // cy.contains("Add data").click({ force: true });
+    // TODO determine why line 25 and/or line 28 are needed occasionally for rollups_spec to pass.  
+    // When the source of the issue is determined they will be removed/uncommented.
 
     // Click on "Sample data" tab
-    // cy.contains("Sample data").click({ force: true });
+    cy.contains("Sample data").click({ force: true });
+
+    // // Click on "Add data" tab
+    // cy.contains("Add data").click({ force: true });
 
     // Load sample eCommerce data
     cy.get(`button[data-test-subj="addSampleDataSetecommerce"]`).click({ force: true });

cypress/integration/snapshots_spec.js

@@ -58,6 +58,9 @@ describe("Snapshots", () => {
       cy.createIndex("test_index_2");
       cy.createIndex("test_index_3");
 
+      // wait for button to be selectable
+      cy.wait(5000);
+
       // Click Take snapshot button
       cy.get("button").contains("Take snapshot").click({ force: true });
 
@@ -68,14 +71,17 @@ describe("Snapshots", () => {
       cy.get(`input[data-test-subj="snapshotNameInput"]`).type("test_snapshot{enter}");
 
       // Select all indexes to be included
+<<<<<<< HEAD
       cy.get(`[data-test-subj="indicesComboBoxInput"]`).type("test_index_1{enter}");
       cy.get(`[data-test-subj="indicesComboBoxInput"]`).type("test_index_2{enter}");
       cy.get(`[data-test-subj="indicesComboBoxInput"]`).type("test_index_3{enter}");
+=======
+      cy.get(`[data-test-subj="indicesComboBoxInput"]`).type("open*{enter}");
+>>>>>>> 1a305b2 (Update 2.4, TODO rollups_spec, remove 'wait' when possible snapshots_spec)
 
       // Click 'Add' button to create snapshot
-      cy.get("button").contains("Add").click({ force: true });
+      cy.get("button").contains("Add", { timeout: 3000 }).click({ force: true });
 
-      cy.wait(3000)
       // check for success status and snapshot name
       cy.get("button").contains("Refresh").click({ force: true });
 
@@ -114,8 +120,8 @@ describe("Snapshots", () => {
       cy.get(`[data-test-subj="checkboxSelectRow-test_repo:test_snapshot"]`).check({ force: true });
 
       // click "Delete" button
-      cy.get("button").contains("Delete").click({ force: true });
-      cy.wait(3000);
+      cy.get("button").contains("Delete", { timeout: 3000 }).click({ force: true });
+
       // click "Delete snapshot" button on modal
       cy.get("button").contains("Delete snapshot").click({ force: true });
 

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "indexManagementDashboards",
-  "version": "2.3.0.0",
-  "opensearchDashboardsVersion": "2.3.0",
+  "version": "2.4.0",
+  "opensearchDashboardsVersion": "2.4.0",
   "configPath": [
     "opensearch_index_management"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensearch_index_management_dashboards",
-  "version": "2.3.0.0",
+  "version": "2.4.0",
   "description": "Opensearch Dashboards plugin for Index Management",
   "main": "index.js",
   "license": "Apache-2.0",