From a21d2a41bbf5ffb99d9813fa57789b7e1d9c31a4 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 24 Jan 2024 10:23:00 -0800 Subject: [PATCH] [Backport 2.x] Fix broken build and failing tests (#574) * Fix broken build and CI Signed-off-by: Ryan Bogan * Change browser to electron Signed-off-by: Ryan Bogan * Increase timeout Signed-off-by: Ryan Bogan * Add Changelog entry Signed-off-by: Ryan Bogan --------- Signed-off-by: Ryan Bogan --- .github/workflows/cypress-workflow.yml | 5 +++-- CHANGELOG.md | 1 + babel.config.js | 4 ++-- cypress.config.js | 1 + cypress/e2e/documentsLayer.cy.js | 4 ++-- .../vector_upload_options.test.tsx.snap | 12 ++++++++++-- .../__snapshots__/filter-by_shape.test.tsx.snap | 6 +++++- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 4de7b27f..da505fd2 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 @@ -155,8 +155,9 @@ 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 --browser electron wait-on: 'http://localhost:5601' + wait-on-timeout: 300 env: CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }} 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 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.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', diff --git a/cypress/e2e/documentsLayer.cy.js b/cypress/e2e/documentsLayer.cy.js index 79059d16..cda25b6f 100644 --- a/cypress/e2e/documentsLayer.cy.js +++ b/cypress/e2e/documentsLayer.cy.js @@ -34,9 +34,9 @@ describe('Documents layer', () => { ); cy.get('[data-test-subj="geoFieldSelect"]').should('contain', 'DestLocation'); cy.get(`button[testSubj="styleTab"]`).click(); - cy.contains('Fill color').click(); + cy.wait(1000).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.get('[name="layerName"]').clear().type('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..46e74ab6 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" - /> + > + +
@@ -294,7 +298,11 @@ Object { viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" - /> + > + +
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" - /> + > + +