Skip to content

Commit

Permalink
refactor: merge/upgrade superset-ui packages (#10790)
Browse files Browse the repository at this point in the history
* refactor: merge/upgrade superset-ui packages

* Fix flaky big number test

* Fix Flaky AdhocFilters test
  • Loading branch information
ktmud authored Sep 9, 2020
1 parent 3b4a992 commit 9a59bdd
Show file tree
Hide file tree
Showing 256 changed files with 823 additions and 1,587 deletions.
5 changes: 0 additions & 5 deletions superset-frontend/.prettierrc

This file was deleted.

2 changes: 1 addition & 1 deletion superset-frontend/.storybook/preview.jsx
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
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}');
});
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
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',
});
}

Expand Down
Loading

0 comments on commit 9a59bdd

Please sign in to comment.