chore: move fixtures and helpers to root (#11812)

This commit is contained in:
Elizabeth Thompson
2020-11-30 14:23:56 -08:00
committed by GitHub
parent 011724750f
commit 84e0606a90
34 changed files with 59 additions and 59 deletions

View File

@@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import { datasourceId } from '../../../fixtures/mockDatasource'; import { datasourceId } from './mockDatasource';
export const sliceId = 18; export const sliceId = 18;

View File

@@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import { datasourceId } from '../../../fixtures/mockDatasource'; import { datasourceId } from 'spec/fixtures/mockDatasource';
import { sliceId } from './mockChartQueries'; import { sliceId } from './mockChartQueries';
export const filterId = 127; export const filterId = 127;

View File

@@ -16,13 +16,13 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import datasources from 'spec/fixtures/mockDatasource';
import messageToasts from 'spec/javascripts/messageToasts/mockMessageToasts';
import chartQueries from './mockChartQueries'; import chartQueries from './mockChartQueries';
import { dashboardLayout } from './mockDashboardLayout'; import { dashboardLayout } from './mockDashboardLayout';
import dashboardInfo from './mockDashboardInfo'; import dashboardInfo from './mockDashboardInfo';
import { emptyFilters } from './mockDashboardFilters'; import { emptyFilters } from './mockDashboardFilters';
import dashboardState from './mockDashboardState'; import dashboardState from './mockDashboardState';
import messageToasts from '../../messageToasts/mockMessageToasts';
import datasources from '../../../fixtures/mockDatasource';
import sliceEntities from './mockSliceEntities'; import sliceEntities from './mockSliceEntities';
export default { export default {

View File

@@ -20,7 +20,7 @@ import React from 'react';
import { shallow } from 'enzyme'; import { shallow } from 'enzyme';
import CollectionTable from 'src/CRUD/CollectionTable'; import CollectionTable from 'src/CRUD/CollectionTable';
import mockDatasource from '../../fixtures/mockDatasource'; import mockDatasource from 'spec/fixtures/mockDatasource';
const props = { const props = {
collection: mockDatasource['7__table'].columns, collection: mockDatasource['7__table'].columns,

View File

@@ -29,9 +29,9 @@ import { DASHBOARD_GRID_ID } from 'src/dashboard/util/constants';
import { import {
filterId, filterId,
sliceEntitiesForDashboard as sliceEntities, sliceEntitiesForDashboard as sliceEntities,
} from '../fixtures/mockSliceEntities'; } from 'spec/fixtures/mockSliceEntities';
import { emptyFilters } from '../fixtures/mockDashboardFilters'; import { emptyFilters } from 'spec/fixtures/mockDashboardFilters';
import mockDashboardData from '../fixtures/mockDashboardData'; import mockDashboardData from 'spec/fixtures/mockDashboardData';
describe('dashboardState actions', () => { describe('dashboardState actions', () => {
const mockState = { const mockState = {

View File

@@ -33,13 +33,13 @@ import DashboardHeader from 'src/dashboard/containers/DashboardHeader';
import DashboardGrid from 'src/dashboard/containers/DashboardGrid'; import DashboardGrid from 'src/dashboard/containers/DashboardGrid';
import * as dashboardStateActions from 'src/dashboard/actions/dashboardState'; import * as dashboardStateActions from 'src/dashboard/actions/dashboardState';
import WithDragDropContext from '../helpers/WithDragDropContext';
import { import {
dashboardLayout as undoableDashboardLayout, dashboardLayout as undoableDashboardLayout,
dashboardLayoutWithTabs as undoableDashboardLayoutWithTabs, dashboardLayoutWithTabs as undoableDashboardLayoutWithTabs,
} from '../fixtures/mockDashboardLayout'; } from 'spec/fixtures/mockDashboardLayout';
import { mockStore, mockStoreWithTabs } from '../fixtures/mockStore'; import { mockStore, mockStoreWithTabs } from 'spec/fixtures/mockStore';
import WithDragDropContext from 'spec/helpers/WithDragDropContext';
const dashboardLayout = undoableDashboardLayout.present; const dashboardLayout = undoableDashboardLayout.present;
const layoutWithTabs = undoableDashboardLayoutWithTabs.present; const layoutWithTabs = undoableDashboardLayoutWithTabs.present;

View File

@@ -26,12 +26,12 @@ import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
import newComponentFactory from 'src/dashboard/util/newComponentFactory'; import newComponentFactory from 'src/dashboard/util/newComponentFactory';
// mock data // mock data
import chartQueries from '../fixtures/mockChartQueries'; import chartQueries from 'spec/fixtures/mockChartQueries';
import datasources from '../../../fixtures/mockDatasource'; import datasources from 'spec/fixtures/mockDatasource';
import dashboardInfo from '../fixtures/mockDashboardInfo'; import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
import { dashboardLayout } from '../fixtures/mockDashboardLayout'; import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
import dashboardState from '../fixtures/mockDashboardState'; import dashboardState from 'spec/fixtures/mockDashboardState';
import { sliceEntitiesForChart as sliceEntities } from '../fixtures/mockSliceEntities'; import { sliceEntitiesForChart as sliceEntities } from 'spec/fixtures/mockSliceEntities';
describe('Dashboard', () => { describe('Dashboard', () => {
const props = { const props = {

View File

@@ -23,10 +23,10 @@ import * as SupersetUI from '@superset-ui/core';
import { CHART_UPDATE_SUCCEEDED } from 'src/chart/chartAction'; import { CHART_UPDATE_SUCCEEDED } from 'src/chart/chartAction';
import { buildActiveFilters } from 'src/dashboard/util/activeDashboardFilters'; import { buildActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
import FiltersBadge from 'src/dashboard/containers/FiltersBadge'; import FiltersBadge from 'src/dashboard/containers/FiltersBadge';
import { getMockStoreWithFilters } from '../fixtures/mockStore'; import { getMockStoreWithFilters } from 'spec/fixtures/mockStore';
import { sliceId } from '../fixtures/mockChartQueries'; import { sliceId } from 'spec/fixtures/mockChartQueries';
import { dashboardFilters } from '../fixtures/mockDashboardFilters'; import { dashboardFilters } from 'spec/fixtures/mockDashboardFilters';
import { dashboardWithFilter } from '../fixtures/mockDashboardLayout'; import { dashboardWithFilter } from 'spec/fixtures/mockDashboardLayout';
describe('FiltersBadge', () => { describe('FiltersBadge', () => {
// there's this bizarre "active filters" thing // there's this bizarre "active filters" thing

View File

@@ -28,7 +28,7 @@ import {
import Modal from 'src/common/components/Modal'; import Modal from 'src/common/components/Modal';
import PropertiesModal from 'src/dashboard/components/PropertiesModal'; import PropertiesModal from 'src/dashboard/components/PropertiesModal';
import { mockStore } from '../fixtures/mockStore'; import { mockStore } from 'spec/fixtures/mockStore';
const dashboardResult = { const dashboardResult = {
json: { json: {

View File

@@ -23,7 +23,7 @@ import sinon from 'sinon';
import { List } from 'react-virtualized'; import { List } from 'react-virtualized';
import SliceAdder from 'src/dashboard/components/SliceAdder'; import SliceAdder from 'src/dashboard/components/SliceAdder';
import { sliceEntitiesForDashboard as mockSliceEntities } from '../fixtures/mockSliceEntities'; import { sliceEntitiesForDashboard as mockSliceEntities } from 'spec/fixtures/mockSliceEntities';
describe('SliceAdder', () => { describe('SliceAdder', () => {
const mockEvent = { const mockEvent = {

View File

@@ -29,10 +29,10 @@ import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
import HoverMenu from 'src/dashboard/components/menu/HoverMenu'; import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer'; import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
import { mockStore } from '../../fixtures/mockStore'; import { mockStore } from 'spec/fixtures/mockStore';
import { sliceId } from '../../fixtures/mockChartQueries'; import { sliceId } from 'spec/fixtures/mockChartQueries';
import { dashboardLayout as mockLayout } from '../../fixtures/mockDashboardLayout'; import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
describe('ChartHolder', () => { describe('ChartHolder', () => {
const props = { const props = {

View File

@@ -24,11 +24,11 @@ import Chart from 'src/dashboard/components/gridComponents/Chart';
import SliceHeader from 'src/dashboard/components/SliceHeader'; import SliceHeader from 'src/dashboard/components/SliceHeader';
import ChartContainer from 'src/chart/ChartContainer'; import ChartContainer from 'src/chart/ChartContainer';
import mockDatasource from '../../../../fixtures/mockDatasource'; import { sliceEntitiesForChart as sliceEntities } from 'spec/fixtures/mockSliceEntities';
import { sliceEntitiesForChart as sliceEntities } from '../../fixtures/mockSliceEntities'; import mockDatasource from 'spec/fixtures/mockDatasource';
import chartQueries, { import chartQueries, {
sliceId as queryId, sliceId as queryId,
} from '../../fixtures/mockChartQueries'; } from 'spec/fixtures/mockChartQueries';
describe('Chart', () => { describe('Chart', () => {
const props = { const props = {

View File

@@ -32,9 +32,9 @@ import IconButton from 'src/dashboard/components/IconButton';
import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer'; import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu'; import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
import { mockStore } from '../../fixtures/mockStore'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { dashboardLayout as mockLayout } from '../../fixtures/mockDashboardLayout'; import { mockStore } from 'spec/fixtures/mockStore';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
describe('Column', () => { describe('Column', () => {
const columnWithoutChildren = { const columnWithoutChildren = {

View File

@@ -30,7 +30,7 @@ import {
DASHBOARD_GRID_TYPE, DASHBOARD_GRID_TYPE,
} from 'src/dashboard/util/componentTypes'; } from 'src/dashboard/util/componentTypes';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
describe('Divider', () => { describe('Divider', () => {
const props = { const props = {

View File

@@ -33,8 +33,8 @@ import {
DASHBOARD_GRID_TYPE, DASHBOARD_GRID_TYPE,
} from 'src/dashboard/util/componentTypes'; } from 'src/dashboard/util/componentTypes';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { mockStoreWithTabs } from '../../fixtures/mockStore'; import { mockStoreWithTabs } from 'spec/fixtures/mockStore';
describe('Header', () => { describe('Header', () => {
const props = { const props = {

View File

@@ -30,9 +30,9 @@ import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu'; import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer'; import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
import { mockStore } from '../../fixtures/mockStore'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { dashboardLayout as mockLayout } from '../../fixtures/mockDashboardLayout'; import { mockStore } from 'spec/fixtures/mockStore';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
describe('Markdown', () => { describe('Markdown', () => {
const props = { const props = {

View File

@@ -32,9 +32,9 @@ import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
import { DASHBOARD_GRID_ID } from 'src/dashboard/util/constants'; import { DASHBOARD_GRID_ID } from 'src/dashboard/util/constants';
import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import { mockStore } from '../../fixtures/mockStore'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { dashboardLayout as mockLayout } from '../../fixtures/mockDashboardLayout'; import { mockStore } from 'spec/fixtures/mockStore';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
describe('Row', () => { describe('Row', () => {
const rowWithoutChildren = { ...mockLayout.present.ROW_ID, children: [] }; const rowWithoutChildren = { ...mockLayout.present.ROW_ID, children: [] };

View File

@@ -28,9 +28,9 @@ import Tab, {
RENDER_TAB, RENDER_TAB,
RENDER_TAB_CONTENT, RENDER_TAB_CONTENT,
} from 'src/dashboard/components/gridComponents/Tab'; } from 'src/dashboard/components/gridComponents/Tab';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { dashboardLayoutWithTabs } from '../../fixtures/mockDashboardLayout'; import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
import { mockStoreWithTabs } from '../../fixtures/mockStore'; import { mockStoreWithTabs } from 'spec/fixtures/mockStore';
describe('Tabs', () => { describe('Tabs', () => {
const props = { const props = {

View File

@@ -30,9 +30,9 @@ import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
import DragDroppable from 'src/dashboard/components/dnd/DragDroppable'; import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
import Tabs from 'src/dashboard/components/gridComponents/Tabs'; import Tabs from 'src/dashboard/components/gridComponents/Tabs';
import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants'; import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
import WithDragDropContext from '../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
import { dashboardLayoutWithTabs } from '../../fixtures/mockDashboardLayout'; import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
import { mockStoreWithTabs } from '../../fixtures/mockStore'; import { mockStoreWithTabs } from 'spec/fixtures/mockStore';
describe('Tabs', () => { describe('Tabs', () => {
const props = { const props = {

View File

@@ -26,7 +26,7 @@ import {
NEW_COMPONENT_SOURCE_TYPE, NEW_COMPONENT_SOURCE_TYPE,
CHART_TYPE, CHART_TYPE,
} from 'src/dashboard/util/componentTypes'; } from 'src/dashboard/util/componentTypes';
import WithDragDropContext from '../../../helpers/WithDragDropContext'; import WithDragDropContext from 'spec/helpers/WithDragDropContext';
describe('DraggableNewComponent', () => { describe('DraggableNewComponent', () => {
const props = { const props = {

View File

@@ -30,13 +30,13 @@ import * as activeDashboardFilters from 'src/dashboard/util/activeDashboardFilte
import { import {
emptyFilters, emptyFilters,
dashboardFilters, dashboardFilters,
} from '../fixtures/mockDashboardFilters'; } from 'spec/fixtures/mockDashboardFilters';
import { import {
sliceEntitiesForDashboard, sliceEntitiesForDashboard,
filterId, filterId,
column, column,
} from '../fixtures/mockSliceEntities'; } from 'spec/fixtures/mockSliceEntities';
import { filterComponent } from '../fixtures/mockDashboardLayout'; import { filterComponent } from 'spec/fixtures/mockDashboardLayout';
describe('dashboardFilters reducer', () => { describe('dashboardFilters reducer', () => {
const { form_data } = sliceEntitiesForDashboard.slices[filterId]; const { form_data } = sliceEntitiesForDashboard.slices[filterId];

View File

@@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
import getLeafComponentIdFromPath from 'src/dashboard/util/getLeafComponentIdFromPath'; import getLeafComponentIdFromPath from 'src/dashboard/util/getLeafComponentIdFromPath';
import { filterId } from '../fixtures/mockSliceEntities'; import { filterId } from 'spec/fixtures/mockSliceEntities';
import { dashboardFilters } from '../fixtures/mockDashboardFilters'; import { dashboardFilters } from 'spec/fixtures/mockDashboardFilters';
describe('getLeafComponentIdFromPath', () => { describe('getLeafComponentIdFromPath', () => {
const path = dashboardFilters[filterId].directPathToFilter; const path = dashboardFilters[filterId].directPathToFilter;

View File

@@ -21,7 +21,7 @@ import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
import { import {
dashboardLayout, dashboardLayout,
dashboardLayoutWithTabs, dashboardLayoutWithTabs,
} from '../fixtures/mockDashboardLayout'; } from 'spec/fixtures/mockDashboardLayout';
describe('updateComponentParentsList', () => { describe('updateComponentParentsList', () => {
const emptyLayout = { const emptyLayout = {

View File

@@ -27,7 +27,7 @@ import { act } from 'react-dom/test-utils';
import Modal from 'src/common/components/Modal'; import Modal from 'src/common/components/Modal';
import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal';
import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
import mockDatasource from '../../fixtures/mockDatasource'; import mockDatasource from 'spec/fixtures/mockDatasource';
const mockStore = configureStore([thunk]); const mockStore = configureStore([thunk]);
const store = mockStore({}); const store = mockStore({});

View File

@@ -25,7 +25,7 @@ import thunk from 'redux-thunk';
import Tabs from 'src/common/components/Tabs'; import Tabs from 'src/common/components/Tabs';
import DatasourceEditor from 'src/datasource/DatasourceEditor'; import DatasourceEditor from 'src/datasource/DatasourceEditor';
import Field from 'src/CRUD/Field'; import Field from 'src/CRUD/Field';
import mockDatasource from '../../fixtures/mockDatasource'; import mockDatasource from 'spec/fixtures/mockDatasource';
const props = { const props = {
datasource: mockDatasource['7__table'], datasource: mockDatasource['7__table'],

View File

@@ -30,7 +30,7 @@ import Modal from 'src/common/components/Modal';
import DatasourceModal from 'src/datasource/DatasourceModal'; import DatasourceModal from 'src/datasource/DatasourceModal';
import DatasourceEditor from 'src/datasource/DatasourceEditor'; import DatasourceEditor from 'src/datasource/DatasourceEditor';
import * as featureFlags from 'src/featureFlags'; import * as featureFlags from 'src/featureFlags';
import mockDatasource from '../../fixtures/mockDatasource'; import mockDatasource from 'spec/fixtures/mockDatasource';
const mockStore = configureStore([thunk]); const mockStore = configureStore([thunk]);
const store = mockStore({}); const store = mockStore({});

View File

@@ -24,7 +24,7 @@ import { shallow } from 'enzyme';
import Popover from 'src/common/components/Popover'; import Popover from 'src/common/components/Popover';
import FilterBoxItemControl from 'src/explore/components/controls/FilterBoxItemControl'; import FilterBoxItemControl from 'src/explore/components/controls/FilterBoxItemControl';
import FormRow from 'src/components/FormRow'; import FormRow from 'src/components/FormRow';
import datasources from '../../../fixtures/mockDatasource'; import datasources from 'spec/fixtures/mockDatasource';
const defaultProps = { const defaultProps = {
label: 'some label', label: 'some label',