This is an automated email from the ASF dual-hosted git repository. hugh pushed a commit to branch hugh/test-ci-lyndsi in repository https://gitbox.apache.org/repos/asf/superset.git
commit 8f1a2bc18aff534862eac1e1a133840e2f01ea96 Author: hughhhh <[email protected]> AuthorDate: Tue Sep 28 16:18:18 2021 -0400 just testing something --- .../cypress/integration/dashboard/url_params.test.ts | 12 ++++++------ .../cypress/integration/explore/AdhocFilters.test.ts | 4 ++-- .../cypress/integration/explore/AdhocMetrics.test.ts | 2 +- .../cypress/integration/explore/advanced_analytics.test.ts | 2 +- .../cypress/integration/explore/annotations.test.ts | 2 +- .../cypress-base/cypress/integration/sqllab/query.test.ts | 2 +- superset-frontend/cypress-base/package.json | 6 +++--- superset-frontend/package.json | 1 + 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.ts index 0f4b839..67553f3 100644 --- a/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/dashboard/url_params.test.ts @@ -32,18 +32,18 @@ describe('Dashboard form data', () => { }); it('should apply url params to slice requests', () => { - cy.intercept('/superset/explore_json/*', request => { - const requestParams = JSON.parse( - parsePostForm(request.body).form_data as string, - ); - expect(requestParams.url_params).deep.eq(urlParams); - }); cy.intercept('/api/v1/chart/data?*', request => { // TODO: export url params to chart data API request.body.queries.forEach((query: { url_params: JsonObject }) => { expect(query.url_params).deep.eq(urlParams); }); }); + cy.intercept('/superset/explore_json/*', request => { + const requestParams = JSON.parse( + parsePostForm(request.body).form_data as string, + ); + expect(requestParams.url_params).deep.eq(urlParams); + }); WORLD_HEALTH_CHARTS.forEach(waitForChartLoad); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts index 2a0d142..6ae5aea 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts @@ -19,9 +19,9 @@ describe('AdhocFilters', () => { beforeEach(() => { cy.login(); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); - cy.intercept('POST', '/superset/explore_json/**').as('postJson'); cy.intercept('GET', '/superset/filter/table/*/name').as('filterValues'); + cy.intercept('POST', '/superset/explore_json/**').as('postJson'); + cy.intercept('GET', '/superset/explore_json/**').as('getJson'); cy.visitChartByName('Boys'); // a table chart cy.verifySliceSuccess({ waitAlias: '@postJson' }); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts index 9983e72..1609558 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/AdhocMetrics.test.ts @@ -19,8 +19,8 @@ describe('AdhocMetrics', () => { beforeEach(() => { cy.login(); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); cy.intercept('POST', '/superset/explore_json/**').as('postJson'); + cy.intercept('GET', '/superset/explore_json/**').as('getJson'); cy.visitChartByName('Num Births Trend'); cy.verifySliceSuccess({ waitAlias: '@postJson' }); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/advanced_analytics.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/advanced_analytics.test.ts index 77ebfbe..a06821e 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/advanced_analytics.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/advanced_analytics.test.ts @@ -19,8 +19,8 @@ describe('Advanced analytics', () => { beforeEach(() => { cy.login(); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); cy.intercept('POST', '/superset/explore_json/**').as('postJson'); + cy.intercept('GET', '/superset/explore_json/**').as('getJson'); }); it('Create custom time compare', () => { diff --git a/superset-frontend/cypress-base/cypress/integration/explore/annotations.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/annotations.test.ts index b895fa5..448a676 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/annotations.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/annotations.test.ts @@ -19,8 +19,8 @@ describe('Annotations', () => { beforeEach(() => { cy.login(); - cy.intercept('GET', '/superset/explore_json/**').as('getJson'); cy.intercept('POST', '/superset/explore_json/**').as('postJson'); + cy.intercept('GET', '/superset/explore_json/**').as('getJson'); }); it('Create formula annotation y-axis goal line', () => { diff --git a/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts b/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts index df05a53..ea43c66 100644 --- a/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/sqllab/query.test.ts @@ -92,8 +92,8 @@ describe('SqlLab query panel', () => { }); it.skip('successfully saves a query', () => { - cy.intercept('savedqueryviewapi/**').as('getSavedQuery'); cy.intercept('superset/tables/**').as('getTables'); + cy.intercept('savedqueryviewapi/**').as('getSavedQuery'); const query = 'SELECT ds, gender, name, num FROM main.birth_names ORDER BY name LIMIT 3'; diff --git a/superset-frontend/cypress-base/package.json b/superset-frontend/cypress-base/package.json index 698496e..b57cf8c 100644 --- a/superset-frontend/cypress-base/package.json +++ b/superset-frontend/cypress-base/package.json @@ -5,19 +5,19 @@ "scripts": { "cypress": "cypress", "cypress-run-chrome": "cypress run --browser chrome --headless", - "cypress-debug": "cypress open --config watchForFileChanges=true" + "cypress-open-debug": "cypress open --config watchForFileChanges=true" }, "author": "Apache", "license": "Apache-2.0", "dependencies": { "@cypress/code-coverage": "^3.9.11", - "@superset-ui/core": "^0.18.4", + "@superset-ui/core": "^0.17.42", "react-dom": "^16.13.0", "rison": "^0.1.1", "shortid": "^2.2.15" }, "devDependencies": { - "cypress": "^6.3.0", + "cypress": "^7.0.0", "eslint-plugin-cypress": "^2.12.1" }, "nyc": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index a6cb456..52afc1d 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -197,6 +197,7 @@ "@babel/preset-env": "^7.12.11", "@babel/preset-react": "^7.12.10", "@babel/register": "^7.12.10", + "@cypress/react": "^5.10.0", "@emotion/jest": "^11.3.0", "@hot-loader/react-dom": "^16.13.0", "@istanbuljs/nyc-config-typescript": "^1.0.1",
