apache · michael-s-molina · Jan 7, 2022 · Dec 30, 2021
diff --git a/superset-frontend/spec/fixtures/mockState.js b/superset-frontend/spec/fixtures/mockState.js
@@ -21,7 +21,7 @@ import messageToasts from 'src/components/MessageToasts/mockMessageToasts';
 import {
   nativeFiltersInfo,
   mockDataMaskInfo,
-} from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+} from 'src/dashboard/fixtures/mockNativeFilters';
 import { user } from 'src/SqlLab/fixtures';
 import chartQueries from './mockChartQueries';
 import { dashboardLayout } from './mockDashboardLayout';

diff --git a/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx b/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
@@ -21,7 +21,7 @@ import messageToasts from 'src/components/MessageToasts/mockMessageToasts';
 import {
   nativeFiltersInfo,
   mockDataMaskInfo,
-} from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+} from 'src/dashboard/fixtures/mockNativeFilters';
 import chartQueries from 'spec/fixtures/mockChartQueries';
 import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
 import dashboardInfo from 'spec/fixtures/mockDashboardInfo';

diff --git a/...s/dashboard/components/Dashboard_spec.jsx → ...c/dashboard/components/Dashboard.test.jsx b/...s/dashboard/components/Dashboard_spec.jsx → ...c/dashboard/components/Dashboard.test.jsx
diff --git a/...oard/components/DashboardBuilder_spec.jsx → ...ashboardBuilder/DashboardBuilder.test.jsx b/...oard/components/DashboardBuilder_spec.jsx → ...ashboardBuilder/DashboardBuilder.test.jsx
diff --git a/...shboard/components/DashboardGrid_spec.jsx → ...shboard/components/DashboardGrid.test.jsx b/...shboard/components/DashboardGrid_spec.jsx → ...shboard/components/DashboardGrid.test.jsx
diff --git a/...ashboard/components/FiltersBadge_spec.tsx → ...onents/FiltersBadge/FiltersBadge.test.tsx b/...ashboard/components/FiltersBadge_spec.tsx → ...onents/FiltersBadge/FiltersBadge.test.tsx
diff --git a/...ashboard/components/MissingChart_spec.tsx → ...ashboard/components/MissingChart.test.tsx b/...ashboard/components/MissingChart_spec.tsx → ...ashboard/components/MissingChart.test.tsx
diff --git a/...board/components/PropertiesModal_spec.jsx → .../PropertiesModal/PropertiesModal.test.jsx b/...board/components/PropertiesModal_spec.jsx → .../PropertiesModal/PropertiesModal.test.jsx
diff --git a/.../components/RefreshIntervalModal_spec.tsx → .../components/RefreshIntervalModal.test.tsx b/.../components/RefreshIntervalModal_spec.tsx → .../components/RefreshIntervalModal.test.tsx
diff --git a/.../dashboard/components/SliceAdder_spec.jsx → .../dashboard/components/SliceAdder.test.jsx b/.../dashboard/components/SliceAdder_spec.jsx → .../dashboard/components/SliceAdder.test.jsx
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
@@ -18,9 +18,8 @@
  */
 import { Provider } from 'react-redux';
 import React from 'react';
-import { mount } from 'enzyme';
+import { styledMount as mount } from 'spec/helpers/theming';
 import sinon from 'sinon';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 
@@ -74,10 +73,6 @@ describe('ChartHolder', () => {
           <ChartHolderConnected {...props} {...overrideProps} />
         </DndProvider>
       </Provider>,
-      {
-        wrappingComponent: ThemeProvider,
-        wrappingComponentProps: { theme: supersetTheme },
-      },
     );
     return wrapper;
   }

diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import newComponentFactory from 'src/dashboard/util/newComponentFactory';
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { initialState } from 'src/SqlLab/fixtures';

diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
@@ -20,7 +20,7 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';

diff --git a/...hboard/components/menu/HoverMenu_spec.tsx → ...hboard/components/menu/HoverMenu.test.tsx b/...hboard/components/menu/HoverMenu_spec.tsx → ...hboard/components/menu/HoverMenu.test.tsx
diff --git a/.../components/menu/WithPopoverMenu_spec.jsx → .../components/menu/WithPopoverMenu.test.jsx b/.../components/menu/WithPopoverMenu_spec.jsx → .../components/menu/WithPopoverMenu.test.jsx
diff --git a/...nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx b/...nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import { fireEvent, render, screen } from 'spec/helpers/testing-library';
 import { mockStore } from 'spec/fixtures/mockStore';
 import { Provider } from 'react-redux';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import CascadeFilterControl, { CascadeFilterControlProps } from '.';
 
 const createProps = (defaultsId = nativeFiltersInfo.filters.DefaultsID) => ({

diff --git a/...nativeFilters/NativeFiltersModal_spec.tsx → ...rsConfigModal/NativeFiltersModal.test.tsx b/...nativeFilters/NativeFiltersModal_spec.tsx → ...rsConfigModal/NativeFiltersModal.test.tsx
diff --git a/...nts/resizable/ResizableContainer_spec.tsx → ...nts/resizable/ResizableContainer.test.tsx b/...nts/resizable/ResizableContainer_spec.tsx → ...nts/resizable/ResizableContainer.test.tsx
diff --git a/...onents/resizable/ResizableHandle_spec.tsx → ...onents/resizable/ResizableHandle.test.tsx b/...onents/resizable/ResizableHandle_spec.tsx → ...onents/resizable/ResizableHandle.test.tsx
diff --git a/...s/dashboard/fixtures/mockNativeFilters.ts → ...c/dashboard/fixtures/mockNativeFilters.ts b/...s/dashboard/fixtures/mockNativeFilters.ts → ...c/dashboard/fixtures/mockNativeFilters.ts
diff --git a/...shboard/reducers/dashboardFilters_spec.js → ...shboard/reducers/dashboardFilters.test.js b/...shboard/reducers/dashboardFilters_spec.js → ...shboard/reducers/dashboardFilters.test.js
diff --git a/...ashboard/reducers/dashboardLayout_spec.js → ...ashboard/reducers/dashboardLayout.test.js b/...ashboard/reducers/dashboardLayout_spec.js → ...ashboard/reducers/dashboardLayout.test.js
diff --git a/...dashboard/reducers/dashboardState_spec.js → ...dashboard/reducers/dashboardState.test.js b/...dashboard/reducers/dashboardState_spec.js → ...dashboard/reducers/dashboardState.test.js
diff --git a/.../dashboard/reducers/sliceEntities_spec.js → .../dashboard/reducers/sliceEntities.test.js b/.../dashboard/reducers/sliceEntities_spec.js → .../dashboard/reducers/sliceEntities.test.js
diff --git a/...shboard/util/componentIsResizable_spec.ts → ...shboard/util/componentIsResizable.test.ts b/...shboard/util/componentIsResizable_spec.ts → ...shboard/util/componentIsResizable.test.ts
diff --git a/...cripts/dashboard/util/dnd-reorder_spec.js → ...nd/src/dashboard/util/dnd-reorder.test.js b/...cripts/dashboard/util/dnd-reorder_spec.js → ...nd/src/dashboard/util/dnd-reorder.test.js
diff --git a/...ashboard/util/dropOverflowsParent_spec.js → ...ashboard/util/dropOverflowsParent.test.js b/...ashboard/util/dropOverflowsParent_spec.js → ...ashboard/util/dropOverflowsParent.test.js
diff --git a/...ard/util/findFirstParentContainer_spec.js → ...ard/util/findFirstParentContainer.test.js b/...ard/util/findFirstParentContainer_spec.js → ...ard/util/findFirstParentContainer.test.js
diff --git a/...ripts/dashboard/util/findParentId_spec.js → ...d/src/dashboard/util/findParentId.test.js b/...ripts/dashboard/util/findParentId_spec.js → ...d/src/dashboard/util/findParentId.test.js
diff --git a/...rd/util/findTabIndexByComponentId_spec.js → ...rd/util/findTabIndexByComponentId.test.js b/...rd/util/findTabIndexByComponentId_spec.js → ...rd/util/findTabIndexByComponentId.test.js
diff --git a/...tChartAndLabelComponentIdFromPath_spec.js → ...tChartAndLabelComponentIdFromPath.test.js b/...tChartAndLabelComponentIdFromPath_spec.js → ...tChartAndLabelComponentIdFromPath.test.js
diff --git a/...hboard/util/getChartIdsFromLayout_spec.js → ...hboard/util/getChartIdsFromLayout.test.js b/...hboard/util/getChartIdsFromLayout_spec.js → ...hboard/util/getChartIdsFromLayout.test.js
diff --git a/...ts/dashboard/util/getDashboardUrl_spec.js → ...rc/dashboard/util/getDashboardUrl.test.js b/...ts/dashboard/util/getDashboardUrl_spec.js → ...rc/dashboard/util/getDashboardUrl.test.js
@@ -18,7 +18,7 @@
  */
 import getDashboardUrl from 'src/dashboard/util/getDashboardUrl';
 import { DASHBOARD_FILTER_SCOPE_GLOBAL } from 'src/dashboard/reducers/dashboardFilters';
-import { DashboardStandaloneMode } from '../../../../src/dashboard/util/constants';
+import { DashboardStandaloneMode } from 'src/dashboard/util/constants';
 
 describe('getChartIdsFromLayout', () => {
   const filters = {

diff --git a/...rd/util/getDetailedComponentWidth_spec.js → ...rd/util/getDetailedComponentWidth.test.js b/...rd/util/getDetailedComponentWidth_spec.js → ...rd/util/getDetailedComponentWidth.test.js
diff --git a/...ts/dashboard/util/getDropPosition_spec.js → ...rc/dashboard/util/getDropPosition.test.js b/...ts/dashboard/util/getDropPosition_spec.js → ...rc/dashboard/util/getDropPosition.test.js
diff --git a/...ard/util/getEffectiveExtraFilters_spec.js → ...ard/util/getEffectiveExtraFilters.test.js b/...ard/util/getEffectiveExtraFilters_spec.js → ...ard/util/getEffectiveExtraFilters.test.js
diff --git a/...util/getFilterConfigsFromFormdata_spec.js → ...util/getFilterConfigsFromFormdata.test.js b/...util/getFilterConfigsFromFormdata_spec.js → ...util/getFilterConfigsFromFormdata.test.js
diff --git a/.../util/getFilterScopeFromNodesTree_spec.js → .../util/getFilterScopeFromNodesTree.test.js b/.../util/getFilterScopeFromNodesTree_spec.js → .../util/getFilterScopeFromNodesTree.test.js
diff --git a/.../util/getFormDataWithExtraFilters_spec.ts → .../util/getFormDataWithExtraFilters.test.ts b/.../util/getFormDataWithExtraFilters_spec.ts → .../util/getFormDataWithExtraFilters.test.ts
@@ -22,8 +22,8 @@ import getFormDataWithExtraFilters, {
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
 import { Filter } from 'src/dashboard/components/nativeFilters/types';
 import { LayoutItem } from 'src/dashboard/types';
-import { dashboardLayout } from '../../../fixtures/mockDashboardLayout';
-import { sliceId as chartId } from '../../../fixtures/mockChartQueries';
+import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
+import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
 
 describe('getFormDataWithExtraFilters', () => {
   const filterId = 'native-filter-1';

diff --git a/...d/util/getLeafComponentIdFromPath_spec.js → ...d/util/getLeafComponentIdFromPath.test.js b/...d/util/getLeafComponentIdFromPath_spec.js → ...d/util/getLeafComponentIdFromPath.test.js
diff --git a/...s/dashboard/util/isDashboardEmpty_spec.ts → ...c/dashboard/util/isDashboardEmpty.test.ts b/...s/dashboard/util/isDashboardEmpty_spec.ts → ...c/dashboard/util/isDashboardEmpty.test.ts
diff --git a/...ripts/dashboard/util/isValidChild_spec.ts → ...d/src/dashboard/util/isValidChild.test.ts b/...ripts/dashboard/util/isValidChild_spec.ts → ...d/src/dashboard/util/isValidChild.test.ts
diff --git a/...ashboard/util/newComponentFactory_spec.js → ...ashboard/util/newComponentFactory.test.js b/...ashboard/util/newComponentFactory_spec.js → ...ashboard/util/newComponentFactory.test.js
diff --git a/...ashboard/util/newEntitiesFromDrop_spec.js → ...ashboard/util/newEntitiesFromDrop.test.js b/...ashboard/util/newEntitiesFromDrop_spec.js → ...ashboard/util/newEntitiesFromDrop.test.js
diff --git a/...d/util/updateComponentParentsList_spec.js → ...d/util/updateComponentParentsList.test.js b/...d/util/updateComponentParentsList_spec.js → ...d/util/updateComponentParentsList.test.js