diff --git a/superset-frontend/spec/javascripts/components/CachedLabel_spec.tsx b/superset-frontend/spec/javascripts/components/CachedLabel_spec.tsx
deleted file mode 100644
index b13c31b7b1..0000000000
--- a/superset-frontend/spec/javascripts/components/CachedLabel_spec.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
-
-import CachedLabel, { CacheLabelProps } from 'src/components/CachedLabel';
-
-const defaultProps = {
- onClick: () => {},
- cachedTimestamp: '2017-01-01',
-};
-
-const setup = (props: CacheLabelProps) => ;
-
-describe('CachedLabel', () => {
- it('is valid', () => {
- expect(React.isValidElement()).toBe(true);
- });
-
- it('renders', () => {
- render(setup(defaultProps));
-
- const label = screen.getByText(/cached/i);
- expect(label).toBeVisible();
- });
-});
diff --git a/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx b/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx
index d9c7c5de76..b8f53bbb39 100644
--- a/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx
+++ b/superset-frontend/src/components/CachedLabel/CachedLabel.test.tsx
@@ -19,21 +19,24 @@
import React from 'react';
import { render, screen } from 'spec/helpers/testing-library';
-import moment from 'moment';
-import { TooltipContent } from './TooltipContent';
+import CachedLabel, { CacheLabelProps } from '.';
-test('Rendering TooltipContent correctly - no timestamp', () => {
- render();
- expect(screen.getByTestId('tooltip-content')?.textContent).toBe(
- 'Loaded from cache. Click to force-refresh',
- );
-});
+const defaultProps = {
+ onClick: () => {},
+ cachedTimestamp: '2017-01-01',
+};
-test('Rendering TooltipContent correctly - with timestamp', () => {
- render();
- expect(screen.getByTestId('tooltip-content')?.textContent).toBe(
- `Loaded data cached ${moment
- .utc('01-01-2000')
- .fromNow()}. Click to force-refresh`,
- );
+const setup = (props: CacheLabelProps) => ;
+
+describe('CachedLabel', () => {
+ it('is valid', () => {
+ expect(React.isValidElement()).toBe(true);
+ });
+
+ it('renders', () => {
+ render(setup(defaultProps));
+
+ const label = screen.getByText(/cached/i);
+ expect(label).toBeVisible();
+ });
});
diff --git a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx b/superset-frontend/src/datasource/ChangeDatasourceModal.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
rename to superset-frontend/src/datasource/ChangeDatasourceModal.test.jsx
diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx b/superset-frontend/src/datasource/DatasourceEditor.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx
rename to superset-frontend/src/datasource/DatasourceEditor.test.jsx
diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx b/superset-frontend/src/datasource/DatasourceModal.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx
rename to superset-frontend/src/datasource/DatasourceModal.test.jsx
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
index 1af0186c39..92053f0a32 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
@@ -24,7 +24,10 @@ import userEvent from '@testing-library/user-event';
import DatasourcePanel, {
Props as DatasourcePanelProps,
} from 'src/explore/components/DatasourcePanel';
-import { columns, metrics } from 'spec/javascripts/datasource/fixtures';
+import {
+ columns,
+ metrics,
+} from 'src/explore/components/DatasourcePanel/fixtures';
import { DatasourceType } from '@superset-ui/core/lib/query/types/Datasource';
import DatasourceControl from 'src/explore/components/controls/DatasourceControl';
diff --git a/superset-frontend/spec/javascripts/datasource/fixtures.tsx b/superset-frontend/src/explore/components/DatasourcePanel/fixtures.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/datasource/fixtures.tsx
rename to superset-frontend/src/explore/components/DatasourcePanel/fixtures.tsx
diff --git a/superset-frontend/spec/javascripts/filters/utils_spec.ts b/superset-frontend/src/filters/utils.test.ts
similarity index 100%
rename from superset-frontend/spec/javascripts/filters/utils_spec.ts
rename to superset-frontend/src/filters/utils.test.ts
diff --git a/superset-frontend/spec/javascripts/modules/dates_spec.js b/superset-frontend/src/modules/dates.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/modules/dates_spec.js
rename to superset-frontend/src/modules/dates.test.js
diff --git a/superset-frontend/spec/javascripts/modules/utils_spec.jsx b/superset-frontend/src/modules/utils.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/modules/utils_spec.jsx
rename to superset-frontend/src/modules/utils.test.jsx
diff --git a/superset-frontend/spec/javascripts/showSavedQuery/utils_spec.jsx b/superset-frontend/src/showSavedQuery/utils.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/showSavedQuery/utils_spec.jsx
rename to superset-frontend/src/showSavedQuery/utils.test.jsx