From 04dd20c56f2711cc9d638459a4d34b7d340e10a8 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 11:14:13 -0800 Subject: [PATCH 01/19] Fix broken build and failing tests Signed-off-by: Ryan Bogan --- .babelrc | 4 ++-- babel.config.js | 4 ++-- cypress/e2e/documentsLayer.cy.js | 4 ++-- .../vector_upload_options.test.tsx.snap | 16 ++++++++++++---- .../__snapshots__/filter-by_shape.test.tsx.snap | 6 +++++- public/components/vector_upload_options.tsx | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.babelrc b/.babelrc index a14d6b62..368a96df 100644 --- a/.babelrc +++ b/.babelrc @@ -13,7 +13,7 @@ "@babel/plugin-syntax-jsx", "@babel/plugin-transform-modules-commonjs", ["@babel/plugin-transform-runtime", { "regenerator": true }], - "@babel/plugin-proposal-class-properties", - "@babel/plugin-proposal-object-rest-spread" + "@babel/plugin-transform-class-properties", + "@babel/plugin-transform-object-rest-spread" ] } diff --git a/babel.config.js b/babel.config.js index fa274ac8..909f5b18 100644 --- a/babel.config.js +++ b/babel.config.js @@ -10,8 +10,8 @@ module.exports = { require('@babel/preset-typescript'), ], plugins: [ - require('@babel/plugin-proposal-class-properties'), - require('@babel/plugin-proposal-object-rest-spread'), + require('@babel/plugin-transform-class-properties'), + require('@babel/plugin-transform-object-rest-spread'), ['@babel/plugin-transform-modules-commonjs', { allowTopLevelThis: true }], [require('@babel/plugin-transform-runtime'), { regenerator: true }], ], diff --git a/cypress/e2e/documentsLayer.cy.js b/cypress/e2e/documentsLayer.cy.js index 79059d16..2355f468 100644 --- a/cypress/e2e/documentsLayer.cy.js +++ b/cypress/e2e/documentsLayer.cy.js @@ -36,9 +36,9 @@ describe('Documents layer', () => { cy.get(`button[testSubj="styleTab"]`).click(); cy.contains('Fill color').click(); cy.get(`button[aria-label="Select #E7664C as the color"]`).click(); - cy.contains('Border color').click(); + cy.wait(1000).contains('Border color').click(); cy.get(`button[aria-label="Select #DA8B45 as the color"]`).click(); - cy.get(`button[testSubj="settingsTab"]`).click(); + cy.wait(1000).get(`button[testSubj="settingsTab"]`).click(); cy.get('[name="layerName"]').clear().type('Documents layer 1'); cy.get(`button[data-test-subj="updateButton"]`).click(); cy.get('[data-test-subj="layerControlPanel"]').should('contain', 'Documents layer 1'); diff --git a/public/components/__snapshots__/vector_upload_options.test.tsx.snap b/public/components/__snapshots__/vector_upload_options.test.tsx.snap index 0c36eed6..b2cfd5f8 100644 --- a/public/components/__snapshots__/vector_upload_options.test.tsx.snap +++ b/public/components/__snapshots__/vector_upload_options.test.tsx.snap @@ -75,7 +75,11 @@ Object { viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" - /> + > + +
@@ -166,7 +170,7 @@ Object { Map name guidleines:
  • - Map name prefix must contain 1-250 characters. + Map name prefix must contain 1-250 characters.
  • Map name prefix must start with a-z. @@ -294,7 +298,11 @@ Object { viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" - /> + > + +
    @@ -385,7 +393,7 @@ Object { Map name guidleines:
    • - Map name prefix must contain 1-250 characters. + Map name prefix must contain 1-250 characters.
    • Map name prefix must start with a-z. diff --git a/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap b/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap index fc92ba44..c6ba9cc3 100644 --- a/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap +++ b/public/components/toolbar/spatial_filter/__snapshots__/filter-by_shape.test.tsx.snap @@ -73,7 +73,11 @@ exports[`render polygon renders filter by polygon option 1`] = ` viewBox="0 0 16 16" width={16} xmlns="http://www.w3.org/2000/svg" - /> + > + +
diff --git a/public/components/vector_upload_options.tsx b/public/components/vector_upload_options.tsx index 9cb34aac..89ce3d59 100644 --- a/public/components/vector_upload_options.tsx +++ b/public/components/vector_upload_options.tsx @@ -373,7 +373,7 @@ const VectorUploadOptions = (props: RegionMapOptionsProps) => { Map name guidleines:
    -
  • Map name prefix must contain 1-250 characters.
    • +
  • Map name prefix must contain 1-250 characters.
  • Map name prefix must start with a-z.
  • Valid characters are a-z, 0-9, - and _ .
  • From fe1156f4300c94aa8be9050bead282e8c73a43fe Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 11:20:04 -0800 Subject: [PATCH 02/19] Add changelog entry Signed-off-by: Ryan Bogan --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cc6c097..47a3792f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,4 +20,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Infrastructure ### Documentation ### Maintenance +* Fix broken build and failing tests [#572](https://github.com/opensearch-project/dashboards-maps/pull/572) ### Refactoring From 125b8b986aabfa2e7c4ea3be6f0f2bdca0d703a0 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 12:24:51 -0800 Subject: [PATCH 03/19] Add bootstrap for OpenSearch-Dashboards before running server in CI Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 85f7a049..16c2d0b6 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -111,6 +111,7 @@ jobs: - name: Run OpenSearch Dashboards server run: | cd OpenSearch-Dashboards + yarn osd bootstrap yarn start --no-base-path --no-watch & shell: bash From 39aef08adc49ab677a45f91c0f90695a24ad66d1 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 12:42:58 -0800 Subject: [PATCH 04/19] Extract bootstrap to its own step Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 16c2d0b6..d0bff1b4 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -108,10 +108,14 @@ jobs: cd OpenSearch-Dashboards/plugins/dashboards-maps yarn osd bootstrap - - name: Run OpenSearch Dashboards server + - name: Bootstrap OpenSearch Dashboards run: | cd OpenSearch-Dashboards yarn osd bootstrap + + - name: Run OpenSearch Dashboards server + run: | + cd OpenSearch-Dashboards yarn start --no-base-path --no-watch & shell: bash From 9ce7661f0ae5ca67cda32b84b963d7bfbe2ddfbb Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 14:46:22 -0800 Subject: [PATCH 05/19] Small modification to sleep logic Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index d0bff1b4..84143b45 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -117,16 +117,7 @@ jobs: run: | cd OpenSearch-Dashboards yarn start --no-base-path --no-watch & - shell: bash - - - name: Sleep until OSD server starts - windows - if: ${{ matrix.os == 'windows-latest' }} - run: Start-Sleep -s 600 - shell: powershell - - - name: Sleep until OSD server starts - non-windows - if: ${{ matrix.os != 'windows-latest' }} - run: sleep 600 + timeout 600 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601)" != "200" ]]; do sleep 5; done' shell: bash - name: Install Cypress From a05be96f0a44d1fe8ea76e92f6c5e2bb4ae3c18c Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 10 Jan 2024 15:11:57 -0800 Subject: [PATCH 06/19] Modify timeout Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 84143b45..61faf270 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -117,7 +117,7 @@ jobs: run: | cd OpenSearch-Dashboards yarn start --no-base-path --no-watch & - timeout 600 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601)" != "200" ]]; do sleep 5; done' + timeout 1800 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601)" != "200" ]]; do sleep 5; done' shell: bash - name: Install Cypress From 2f34540d0f17dbecb4552f6dfecdd2834684fa91 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Thu, 11 Jan 2024 15:51:39 -0800 Subject: [PATCH 07/19] Modify wait on for cypress tests Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 61faf270..3238f5a8 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -108,16 +108,20 @@ jobs: cd OpenSearch-Dashboards/plugins/dashboards-maps yarn osd bootstrap - - name: Bootstrap OpenSearch Dashboards - run: | - cd OpenSearch-Dashboards - yarn osd bootstrap - - name: Run OpenSearch Dashboards server run: | cd OpenSearch-Dashboards yarn start --no-base-path --no-watch & - timeout 1800 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601)" != "200" ]]; do sleep 5; done' + shell: bash + + - name: Sleep until OSD server starts - windows + if: ${{ matrix.os == 'windows-latest' }} + run: Start-Sleep -s 600 + shell: powershell + + - name: Sleep until OSD server starts - non-windows + if: ${{ matrix.os != 'windows-latest' }} + run: sleep 600 shell: bash - name: Install Cypress @@ -152,7 +156,7 @@ jobs: with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps command: yarn run cypress run --browser chrome - wait-on: 'http://localhost:5601' + wait-on: 'http://localhost:5601/api/status' env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From b7403611d09b2f1473e64e929c993d387d808e63 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Thu, 11 Jan 2024 16:22:30 -0800 Subject: [PATCH 08/19] Change dashboards server call Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 3238f5a8..724c5a92 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -111,7 +111,7 @@ jobs: - name: Run OpenSearch Dashboards server run: | cd OpenSearch-Dashboards - yarn start --no-base-path --no-watch & + yarn start --no-base-path --no-watch --server.host="0.0.0.0" & shell: bash - name: Sleep until OSD server starts - windows @@ -156,7 +156,6 @@ jobs: with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps command: yarn run cypress run --browser chrome - wait-on: 'http://localhost:5601/api/status' env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From 6809a0302758998ed702711dbb8dc729db9f66bc Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Fri, 12 Jan 2024 09:28:51 -0800 Subject: [PATCH 09/19] Attempt to fix memory failure Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 724c5a92..ea38405b 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -155,7 +155,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps - command: yarn run cypress run --browser chrome + command: yarn run cypress run --headless --browser chrome env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From cde14f115988bcf5f792a0829df2a508d6792494 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Fri, 12 Jan 2024 10:16:19 -0800 Subject: [PATCH 10/19] Potential memory fix Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index ea38405b..15973019 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -155,7 +155,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps - command: yarn run cypress run --headless --browser chrome + command: yarn run cypress run --browser chrome --disable-dev-shm-usage env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From c5aa22d493b72b8db5c1147d285dcf5d05a3a41f Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 16 Jan 2024 12:03:16 -0800 Subject: [PATCH 11/19] Remove invalid command flag Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 15973019..724c5a92 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -155,7 +155,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps - command: yarn run cypress run --browser chrome --disable-dev-shm-usage + command: yarn run cypress run --browser chrome env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From 881b192ac40170f82d08b55ad7ca91a1d0b94015 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 16 Jan 2024 12:42:13 -0800 Subject: [PATCH 12/19] Disable dev shm usage in cypress index.js for Chrome browsers Signed-off-by: Ryan Bogan --- cypress/plugins/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index f58b65e0..947eb458 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -24,6 +24,13 @@ * @type {Cypress.PluginConfig} */ module.exports = (on, config) => { + on('before:browser:launch', (browser = {}, launchOptions) => { + if (browser.family === 'chromium') { + launchOptions.args.push('--disable-dev-shm-usage'); + } + + return launchOptions; + }); // `on` is used to hook into various events Cypress emits // `config` is the resolved Cypress config }; From 9cf6867d4a32e95bceecc38501f35c69e8a580cf Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 16 Jan 2024 13:17:44 -0800 Subject: [PATCH 13/19] Add headless flag Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 724c5a92..ea38405b 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -155,7 +155,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps - command: yarn run cypress run --browser chrome + command: yarn run cypress run --headless --browser chrome env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From 45c6817b64ca2fdba8d9553e6082ccde8114c687 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Fri, 19 Jan 2024 10:20:21 -0800 Subject: [PATCH 14/19] Change browser from Chrome to electron Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index ea38405b..64679aa9 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -155,7 +155,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps - command: yarn run cypress run --headless --browser chrome + command: yarn run cypress run --browser electron env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} From 604966fbd21190135824a8b06a4aeb34bccfed60 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Fri, 19 Jan 2024 11:30:17 -0800 Subject: [PATCH 15/19] Add video upload from tests Signed-off-by: Ryan Bogan --- cypress.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress.config.js b/cypress.config.js index 10f29496..1bba18a4 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,6 +1,7 @@ const { defineConfig } = require('cypress') module.exports = defineConfig({ + video: true, defaultCommandTimeout: 120000, env: { opensearch_url: 'localhost:9200', From 4fac2d5e432c5d6db63f8e4b442b46a032e00bc4 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Fri, 19 Jan 2024 12:04:31 -0800 Subject: [PATCH 16/19] Increase timeout for Windows CI Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 64679aa9..78468167 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -116,7 +116,7 @@ jobs: - name: Sleep until OSD server starts - windows if: ${{ matrix.os == 'windows-latest' }} - run: Start-Sleep -s 600 + run: Start-Sleep -s 1800 shell: powershell - name: Sleep until OSD server starts - non-windows From e0c4248d82be71c2bc9dbe792a4b4b38f3c762d5 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 23 Jan 2024 10:17:32 -0800 Subject: [PATCH 17/19] Test CI change Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 78468167..bc0cd468 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -116,7 +116,7 @@ jobs: - name: Sleep until OSD server starts - windows if: ${{ matrix.os == 'windows-latest' }} - run: Start-Sleep -s 1800 + run: Start-Sleep -s 600 shell: powershell - name: Sleep until OSD server starts - non-windows @@ -145,12 +145,6 @@ jobs: path: ${{ matrix.cypress_cache_folder }} key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }} - - name: Reset npm's script shell - if: ${{ matrix.os == 'windows-latest' }} - run: | - # Resetting npm's script shell for Windows so `yarn run cypress` doesn't have conflicts - npm config delete script-shell - - name: Run Cypress tests uses: cypress-io/github-action@v5 with: From abcbef4d21380c555adc78fc531e05d97e98ebaa Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 23 Jan 2024 10:45:56 -0800 Subject: [PATCH 18/19] Revert previous change Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index bc0cd468..487c1061 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -93,12 +93,6 @@ jobs: - run: node -v - run: yarn -v - - name: Set npm to use bash for shell - if: ${{ matrix.os == 'windows-latest' }} - run: | - # Sets Windows to use bash for npm shell so the script commands work as intended - npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe" - - name: Move plugin to OpenSearch-Dashboards Plugins Directory run: | mv dashboards-maps OpenSearch-Dashboards/plugins/dashboards-maps From 561344bf1d248092570a651ae7d950d1c9aab18f Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Tue, 23 Jan 2024 11:00:09 -0800 Subject: [PATCH 19/19] Add wait on Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 487c1061..cd2bf864 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -93,6 +93,12 @@ jobs: - run: node -v - run: yarn -v + - name: Set npm to use bash for shell + if: ${{ matrix.os == 'windows-latest' }} + run: | + # Sets Windows to use bash for npm shell so the script commands work as intended + npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe" + - name: Move plugin to OpenSearch-Dashboards Plugins Directory run: | mv dashboards-maps OpenSearch-Dashboards/plugins/dashboards-maps @@ -139,11 +145,19 @@ jobs: path: ${{ matrix.cypress_cache_folder }} key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }} + - name: Reset npm's script shell + if: ${{ matrix.os == 'windows-latest' }} + run: | + # Resetting npm's script shell for Windows so `yarn run cypress` doesn't have conflicts + npm config delete script-shell + - name: Run Cypress tests uses: cypress-io/github-action@v5 with: working-directory: OpenSearch-Dashboards/plugins/dashboards-maps command: yarn run cypress run --browser electron + wait-on: 'http://localhost:5601' + wait-on-timeout: 300 env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }}