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

refactor: merge/upgrade superset-ui packages #10790

Merged
merged 3 commits into from
Sep 9, 2020
Merged

refactor: merge/upgrade superset-ui packages #10790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06c9bb6
refactor: merge/upgrade superset-ui packages
ktmud Sep 4, 2020
3ef00cb
Fix flacky big number test
ktmud Sep 9, 2020
b963251
Fix Flacky AdhocFilters test
ktmud Sep 9, 2020
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
5 changes: 0 additions & 5 deletions superset-frontend/.prettierrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion superset-frontend/.storybook/preview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { jsxDecorator } from 'storybook-addon-jsx';
import { addParameters } from '@storybook/react';
import { withPaddings } from 'storybook-addon-paddings';

import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';

import '../src/theme.ts';
import './storybook.css';
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ describe('AdhocFilters', () => {

cy.get('[data-test=adhoc_filters]').within(() => {
cy.get('.Select__control').click();
cy.get('input[type=text]').type('name{enter}');
cy.get('input[type=text]').focus().type('name{enter}');
Copy link
Member Author

Choose a reason for hiding this comment

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

Fixing an input is covered by "Choose a metric..." placeholder error.

});
cy.get('#filter-edit-popover').within(() => {
cy.get('[data-test=adhoc-filter-simple-value]').within(() => {
cy.get('.Select__control').click();
cy.get('input[type=text]').type('Any{enter}');
cy.get('input[type=text]').focus().type('Any{enter}');
});
cy.get('button').contains('Save').click();
});
Expand All @@ -53,7 +53,7 @@ describe('AdhocFilters', () => {

cy.get('[data-test=adhoc_filters]').within(() => {
cy.get('.Select__control').click();
cy.get('input[type=text]').type('name{enter}');
cy.get('input[type=text]').focus().type('name{enter}');
});

cy.get('#filter-edit-popover').within(() => {
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/cypress-base/cypress/integration/explore/visualizations/big_number.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('Visualization > Big Number with Trendline', () => {
cy.visitChartByParams(JSON.stringify(formData));
cy.verifySliceSuccess({
waitAlias: '@getJson',
chartSelector: '.big_number',
chartSelector: '.superset-legacy-chart-big-number',
Copy link
Member Author

Choose a reason for hiding this comment

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

SupersetChart may render before the chart content is rendered, so Cypress will find an empty div.big_number (the wrapper of the actual chart), breaking the test.

});
}

Expand Down
Loading