Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(frontend): uplift Cypress to v13 #29265

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft

chore(frontend): uplift Cypress to v13 #29265

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3f56ab8
feat(frontend): uplift Cypress to v11
hainenber Jun 15, 2024
eeb8d86
fix(ci): uplift Cypress to v12 to fix failed post-v11 E2E failure
hainenber Jun 15, 2024
18c8ced
fix(ci): remove obsolete workaround for Cypress <12.15.0
hainenber Jun 15, 2024
3dda2cb
chore(build): disable interruptive Cypress 12's ESLint rule
hainenber Jun 15, 2024
3536dca
feat(build): uplift Cypress to v13 to fix incompatibility with Webpack 5
hainenber Jun 15, 2024
72d8cf3
fix(ci): preserve cookie across test for Cypress v12
hainenber Jun 15, 2024
13f5c79
chore: fix ESlint issue
hainenber Jun 15, 2024
54c9de7
fix(e2e): fix failed E2E test in Cypress 13 by disabling test isolation
hainenber Jun 15, 2024
e323cb9
chore(e2e): remove deprecated Cypress config
hainenber Jun 15, 2024
0675daf
fix(e2e): fix leftover failed E2E tests
hainenber Jun 15, 2024
61a408c
fix(e2e): dedicated test setup for post-Cypress13's Bar Chart v2
hainenber Jun 16, 2024
b599862
fix(e2e): resolve failed `GaugeChart` test after upgrading Cypress to…
hainenber Jun 16, 2024
d0f8a25
fix(e2e): resolve failed `nativeFilters` test after upgrading Cypress…
hainenber Jun 16, 2024
543c596
chore: fix ESLint error
hainenber Jun 16, 2024
db4985a
fix(e2e): prevent renderer crash due to memory overconsumption
hainenber Jun 16, 2024
bec8da1
Revert "fix(e2e): prevent renderer crash due to memory overconsumption"
hainenber Jun 16, 2024
6bbb7ac
fix(e2e): increase retries for flaky test + skip a weirdly running `n…
hainenber Jun 16, 2024
f4dbbad
chore: execute `npm run lint-fix`
hainenber Jun 17, 2024
af476bb
fix(e2e): prevent renderer crash due to memory overconsumption
hainenber Jun 17, 2024
b46baff
Merge branch 'master' into uplift-cypress-to-v13
hainenber Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion superset-frontend/cypress-base/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"@typescript-eslint/explicit-module-boundary-types": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/camelcase": 0,
"cypress/no-unnecessary-waiting": 0 // see issue https://github.com/cypress-io/eslint-plugin-cypress/issues/69
"cypress/no-unnecessary-waiting": 0, // see issue https://github.com/cypress-io/eslint-plugin-cypress/issues/69
"cypress/unsafe-to-chain-command": 0
},
"settings": {
"import/resolver": {
Expand Down
22 changes: 0 additions & 22 deletions superset-frontend/cypress-base/cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export default eyesPlugin(
experimentalFetchPolyfill: true,
requestTimeout: 10000,
video: false,
videoUploadOnPasses: false,
viewportWidth: 1280,
viewportHeight: 1024,
projectId: 'ukwxzo',
Expand All @@ -40,27 +39,6 @@ export default eyesPlugin(
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
// ECONNRESET on Chrome/Chromium 117.0.5851.0 when using Cypress <12.15.0
// Check https://github.com/cypress-io/cypress/issues/27804 for context
// TODO: This workaround should be removed when upgrading Cypress
on('before:browser:launch', (browser, launchOptions) => {
if (browser.name === 'chrome' && browser.isHeadless) {
// eslint-disable-next-line no-param-reassign
launchOptions.args = launchOptions.args.map(arg => {
if (arg === '--headless') {
return '--headless=new';
}

return arg;
});

launchOptions.args.push(
...['--disable-dev-shm-usage', '--disable-gpu'],
);
}
return launchOptions;
});

// eslint-disable-next-line global-require,import/extensions
return require('./cypress/plugins/index.js')(on, config);
},
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/cypress-base/cypress/e2e/chart_list/filter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { CHART_LIST } from 'cypress/utils/urls';
import { setGridMode, clearAllInputs } from 'cypress/utils';
import { setFilter } from '../explore/utils';

describe('Charts filters', () => {
describe('Charts filters', { testIsolation: false }, () => {
before(() => {
cy.visit(CHART_LIST);
setGridMode('card');
Expand Down
10 changes: 5 additions & 5 deletions superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ function visitChartList() {
cy.wait('@filtering');
}

describe('Charts list', () => {
describe('Cross-referenced dashboards', () => {
describe('Charts list', { testIsolation: false }, () => {
describe('Cross-referenced dashboards', { testIsolation: false }, () => {
beforeEach(() => {
cy.createSampleDashboards([0, 1, 2, 3]);
cy.createSampleCharts([0]);
Expand Down Expand Up @@ -99,7 +99,7 @@ describe('Charts list', () => {
});
});

describe('list mode', () => {
describe('list mode', { testIsolation: false }, () => {
before(() => {
cy.createSampleDashboards([0, 1, 2, 3]);
cy.createSampleCharts([0]);
Expand Down Expand Up @@ -144,7 +144,7 @@ describe('Charts list', () => {
});
});

describe('card mode', () => {
describe('card mode', { testIsolation: false }, () => {
before(() => {
visitChartList();
setGridMode('card');
Expand Down Expand Up @@ -183,7 +183,7 @@ describe('Charts list', () => {
});
});

describe('common actions', () => {
describe('common actions', { testIsolation: false }, () => {
beforeEach(() => {
cy.createSampleCharts([0, 1, 2, 3]);
visitChartList();
Expand Down
147 changes: 139 additions & 8 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@
});
};

describe('Drill by modal', () => {
describe('Drill by modal', { testIsolation: false }, () => {
beforeEach(() => {
closeModal();
});
before(() => {
cy.visit(SUPPORTED_CHARTS_DASHBOARD);
});

describe('Modal actions + Table', () => {
describe('Modal actions + Table', { testIsolation: false }, () => {
before(() => {
closeModal();
openTopLevelTab('Tier 1');
Expand Down Expand Up @@ -375,7 +375,7 @@
});
});

describe('Tier 1 charts', () => {
describe('Tier 1 charts', { testIsolation: false }, () => {
before(() => {
closeModal();
openTopLevelTab('Tier 1');
Expand Down Expand Up @@ -524,10 +524,141 @@
});

it('Bar Chart V2', () => {
testEchart('echarts_timeseries_bar', 'Bar Chart V2', [
const vizType = 'echarts_timeseries_bar';
const chartName = 'Bar Chart V2';
const drillClickCoordinates = [
[70, 94],
[362, 68],
]);
[362, 474],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it's due to Cypress upgrade or else but the previous coordinates were flaky. I have to manually tinker around to pick out the least "flaky" coordinates to pass local CI

];
const furtherDrillDimension = 'name';

cy.get(`[data-test-viz-type='${vizType}'] canvas`).then($canvas => {
// click 'boy'
cy.wrap($canvas)
.scrollIntoView()
.trigger(
'mouseover',
drillClickCoordinates[0][0],
drillClickCoordinates[0][1],
)
.rightclick(drillClickCoordinates[0][0], drillClickCoordinates[0][1]);

drillBy('state').then(intercepted => {
verifyExpectedFormData(intercepted, {
groupby: ['state'],
adhoc_filters: [
{
clause: 'WHERE',
comparator: 'boy',
expressionType: 'SIMPLE',
operator: '==',
operatorId: 'EQUALS',
subject: 'gender',
},
],
});
});

cy.getBySel(`"Drill by: ${chartName}-modal"`).as('drillByModal');

cy.get('@drillByModal')
.find('.draggable-trigger')
.should('contain', chartName);

cy.get('@drillByModal')
.find('.ant-breadcrumb')
.should('be.visible')
.and('contain', 'gender (boy)')
.and('contain', '/')
.and('contain', 'state');

cy.get('@drillByModal')
.find('[data-test="drill-by-chart"]')
.should('be.visible');

// further drill
cy.get(`[data-test="drill-by-chart"] canvas`).then($canvas => {
// click 'other'
cy.wrap($canvas)
.scrollIntoView()
.trigger(
'mouseenter',
drillClickCoordinates[1][0],
drillClickCoordinates[1][1],
)
.rightclick(
drillClickCoordinates[1][0],
drillClickCoordinates[1][1],
);

drillBy(furtherDrillDimension).then(intercepted => {
const actualFormData = intercepted.request.body?.form_data;
expect(actualFormData.groupby).to.eql([furtherDrillDimension]);
expect(actualFormData.adhoc_filters).to.have.length(2);
expect(actualFormData.adhoc_filters[0]).to.eql({
clause: 'WHERE',
comparator: 'boy',
expressionType: 'SIMPLE',
operator: '==',
operatorId: 'EQUALS',
subject: 'gender',
});
Object.entries({
clause: 'WHERE',
expressionType: 'SIMPLE',
operator: '==',
operatorId: 'EQUALS',
subject: 'state',
}).forEach(([key, val]) => {
expect(actualFormData.adhoc_filters[1][key]).to.eql(val);
});
});

cy.get('@drillByModal')
.find('[data-test="drill-by-chart"]')
.should('be.visible');

// undo - back to drill by state
interceptV1ChartData('drillByUndo');
cy.get('@drillByModal')
.find('.ant-breadcrumb')
.should('be.visible')
.and('contain', 'gender (boy)')
.and('contain', '/')
.and('contain', 'state')
.and('contain', furtherDrillDimension)
.contains('state (')
.click();
cy.wait('@drillByUndo').then(intercepted => {
verifyExpectedFormData(intercepted, {
groupby: ['state'],
adhoc_filters: [
{
clause: 'WHERE',
comparator: 'boy',
expressionType: 'SIMPLE',
operator: '==',
operatorId: 'EQUALS',
subject: 'gender',
},
],
});
});

cy.get('@drillByModal')
.find('.ant-breadcrumb')
.should('be.visible')
.and('contain', 'gender (boy)')
.and('contain', '/')
.and('not.contain', furtherDrillDimension)
.and('not.contain', 'state (')
.and('contain', 'state');

cy.get('@drillByModal')
.find('[data-test="drill-by-chart"]')
.should('be.visible');
});
});
});

it('Pie Chart', () => {
Expand All @@ -538,7 +669,7 @@
});
});

describe('Tier 2 charts', () => {
describe('Tier 2 charts', { testIsolation: false }, () => {
before(() => {
closeModal();
openTopLevelTab('Tier 2');
Expand Down Expand Up @@ -588,7 +719,7 @@
it('Gauge Chart', () => {
testEchart('gauge_chart', 'Gauge Chart', [
[151, 95],
[300, 143],
[300, NaN], // this fixes the test after upgrading to Cypress 13

Check failure on line 722 in superset-frontend/cypress-base/cypress/e2e/dashboard/drillby.test.ts

View workflow job for this annotation

GitHub Actions / frontend-build 

Delete `·`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is completely voodoo magic to me. Previous coordinates didn't work and frustratingly I entered NaN and it worked

]);
});

Expand Down
Loading
Loading