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.

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

fix: tests errors and warnings - iteration 4 (#12212) #12223

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions superset-frontend/spec/fixtures/mockDashboardState.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ export default {
isPublished: true,
css: '',
focusedFilterField: null,
refreshFrequency: 0,
};
4 changes: 2 additions & 2 deletions superset-frontend/spec/fixtures/mockState.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import { dashboardLayout } from './mockDashboardLayout';
import dashboardInfo from './mockDashboardInfo';
import { emptyFilters } from './mockDashboardFilters';
import dashboardState from './mockDashboardState';
import sliceEntities from './mockSliceEntities';
import { sliceEntitiesForChart } from './mockSliceEntities';

export default {
datasources,
sliceEntities,
sliceEntities: sliceEntitiesForChart,
charts: chartQueries,
nativeFilters: nativeFiltersInfo,
dashboardInfo,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,13 @@ describe('AlteredSliceTag', () => {
);
const rows = getTableWrapperFromModalBody(modalBody).find('tr');
expect(rows).toHaveLength(8);
const fakeRow = mount(<div>{rows.get(1)}</div>);
expect(fakeRow.find('tr')).toHaveLength(1);
expect(fakeRow.find('td')).toHaveLength(3);
const slice = mount(
<table>
<tbody>{rows.get(1)}</tbody>
</table>,
);
expect(slice.find('tr')).toHaveLength(1);
expect(slice.find('td')).toHaveLength(3);
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import React from 'react';
import { mount } from 'enzyme';
import Button from 'src/components/Button';
import { act } from 'react-dom/test-utils';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
import Modal from 'src/common/components/Modal';
Expand All @@ -44,15 +45,19 @@ describe('ConfirmStatusChange', () => {
);

it('opens a confirm modal', () => {
wrapper.find('#btn1').first().props().onClick('foo');
act(() => {
wrapper.find('#btn1').first().props().onClick('foo');
});

wrapper.update();

expect(wrapper.find(Modal)).toExist();
});

it('calls the function on confirm', () => {
wrapper.find(Button).last().props().onClick();
act(() => {
wrapper.find(Button).last().props().onClick();
});

expect(mockedProps.onConfirm).toHaveBeenCalledWith('foo');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,37 +150,40 @@ describe('ListView', () => {

it('calls fetchData on mount', () => {
expect(wrapper.find(ListView)).toExist();
expect(mockedProps.fetchData.mock.calls[0]).toMatchInlineSnapshot(`
Array [
Object {
"filters": Array [],
"pageIndex": 0,
"pageSize": 1,
"sortBy": Array [],
},
]
`);
expect(mockedProps.fetchData.mock.calls[0]).toMatchInlineSnapshot(
`
Array [
Object {
"filters": Array [],
"pageIndex": 0,
"pageSize": 1,
"sortBy": Array [],
},
]
`,
);
});

it('calls fetchData on sort', () => {
wrapper.find('[data-test="sort-header"]').at(1).simulate('click');

expect(mockedProps.fetchData).toHaveBeenCalled();
expect(mockedProps.fetchData.mock.calls[0]).toMatchInlineSnapshot(`
Array [
Object {
"filters": Array [],
"pageIndex": 0,
"pageSize": 1,
"sortBy": Array [
Object {
"desc": false,
"id": "id",
},
],
},
]
`);
expect(mockedProps.fetchData.mock.calls[0]).toMatchInlineSnapshot(
`
Array [
Object {
"filters": Array [],
"pageIndex": 0,
"pageSize": 1,
"sortBy": Array [
Object {
"desc": false,
"id": "id",
},
],
},
]
`,
);
});

it('renders pagination controls', () => {
Expand Down Expand Up @@ -363,13 +366,14 @@ describe('ListView', () => {
);
});

it('renders and empty state when there is no data', () => {
it('renders and empty state when there is no data', async () => {
const props = {
...mockedProps,
data: [],
};

const wrapper2 = factory(props);
await waitForComponentToPaint(wrapper2);
expect(wrapper2.find(Empty)).toExist();
});

Expand Down Expand Up @@ -461,7 +465,7 @@ describe('ListView', () => {
initialSort: [{ id: 'something' }],
});

act(() => {
await act(async () => {
wrapper2.find('[data-test="card-sort-select"]').first().props().onChange({
desc: false,
id: 'something',
Expand All @@ -470,7 +474,6 @@ describe('ListView', () => {
});
});

wrapper2.update();
expect(mockedProps.fetchData).toHaveBeenCalled();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ import { Provider } from 'react-redux';
import configureStore from 'redux-mock-store';
import SupersetResourceSelect from 'src/components/SupersetResourceSelect';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import fetchMock from 'fetch-mock';

describe('SupersetResourceSelect', () => {
const NOOP = () => {};

fetchMock.get('glob:*/api/v1/dataset/?q=*', {});

it('is a valid element', () => {
// @ts-ignore
expect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { Provider } from 'react-redux';
import React from 'react';
import { shallow, mount } from 'enzyme';
import sinon from 'sinon';

import fetchMock from 'fetch-mock';
import { ParentSize } from '@vx/responsive';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import { Sticky, StickyContainer } from 'react-sticky';
Expand All @@ -44,6 +44,8 @@ import WithDragDropContext from 'spec/helpers/WithDragDropContext';
const dashboardLayout = undoableDashboardLayout.present;
const layoutWithTabs = undoableDashboardLayoutWithTabs.present;

fetchMock.get('glob:*/csstemplateasyncmodelview/api/read', {});

describe('DashboardBuilder', () => {
let favStarStub;

Expand All @@ -67,6 +69,7 @@ describe('DashboardBuilder', () => {
colorScheme: undefined,
handleComponentDrop() {},
setDirectPathToChild: sinon.spy(),
setMountedTab() {},
};

function setup(overrideProps, useProvider = false, store = mockStore) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ describe('DashboardGrid', () => {
handleComponentDrop() {},
resizeComponent() {},
width: 500,
isComponentVisible: true,
setDirectPathToChild() {},
};

function setup(overrideProps) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { shallow } from 'enzyme';
import sinon from 'sinon';
import { LineEditableTabs } from 'src/common/components/Tabs';
import { Modal } from 'src/common/components';

import fetchMock from 'fetch-mock';
import { styledMount as mount } from 'spec/helpers/theming';
import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
Expand All @@ -35,6 +35,8 @@ import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
import { mockStoreWithTabs } from 'spec/fixtures/mockStore';

describe('Tabs', () => {
fetchMock.post('glob:*/r/shortner/', {});

const props = {
id: 'TABS_ID',
parentId: DASHBOARD_ROOT_ID,
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/components/Menu/LanguagePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export default function LanguagePicker({
<NavDropdown
onMouseEnter={() => setDropdownOpen(true)}
onMouseLeave={() => setDropdownOpen(false)}
onToggle={value => setDropdownOpen(value)}
open={dropdownOpen}
id="locale-dropdown"
title={
Expand Down