Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Move the test-side store mocks into test support (#81499)

Romeo Van Snick5db23f418206
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
index 2238fcae1e3..e6f997ee147 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
@@ -4,14 +4,14 @@ import {
findRequests,
setupNotificationChannelsEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
+import { createMockSettingsState } from "__support__/state/settings";
import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";
import { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";
import {
createMockLoginStatusState,
createMockSdkState,
} from "embedding-sdk-bundle/test/mocks/state";
-import { createMockState } from "metabase/redux/store/mocks";
-import { createMockSettingsState } from "metabase/redux/store/mocks/settings";
import {
createMockTokenFeatures,
createMockUser,
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx
index 22074603be3..29cc6a5f78c 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx
@@ -6,14 +6,11 @@ import {
setupCollectionsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Database, SearchModel, Table } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
index ece9e27ece2..e7f720e0b21 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
index ddf1c3d1127..02638aecac1 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { render, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import type { Database } from "metabase-types/api";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx
index b6b3b4479fe..e6852ed06e2 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { render, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
index 00d2b9af88d..42923820757 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx
index 1d9c7091068..c177767c5d7 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/RequireMetabotConfigured.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { RequireMetabotConfigured } from "./RequireMetabotConfigured";
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.unit.spec.tsx
index 03f6e795fc6..520878d0ed3 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/MetabotFeatureAccessPage.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupMetabotGroupPermissionsEndpoint,
setupUpdateMetabotGroupPermissionsEndpoint,
} from "__support__/server-mocks/metabot";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { AIToolKey, type MetabotGroupPermission } from "metabase-types/api";
import { createMockGroup } from "metabase-types/api/mocks";
import { createMockMetabotGroupPermissions } from "metabase-types/api/mocks/metabot";
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
index 8a6e216d13b..b1cc59258d8 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
@@ -9,8 +9,8 @@ import {
setupAIControlsInstanceLimitEndpoint,
setupUpdateAIControlsInstanceLimitEndpoint,
} from "__support__/server-mocks/metabot";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { MetabotLimitPeriod, MetabotLimitType } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.unit.spec.tsx
index 1948f83622c..53d8de7518e 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupAIControlsTenantLimitsEndpoint,
setupUpdateAIControlsGroupLimitEndpoint,
} from "__support__/server-mocks/metabot";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { MetabotGroupLimit } from "metabase-types/api";
import { createMockGroup } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
index 4108cf335cc..a194a0fb5f1 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import * as domUtils from "metabase/utils/dom";
import * as iframeUtils from "metabase/utils/iframe";
diff --git a/enterprise/frontend/src/metabase-enterprise/browse/models/BrowseModels.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/browse/models/BrowseModels.unit.spec.tsx
index 20bca191855..9f02ab9be1c 100644
--- a/enterprise/frontend/src/metabase-enterprise/browse/models/BrowseModels.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/browse/models/BrowseModels.unit.spec.tsx
@@ -6,13 +6,13 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockSetupState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
import { BrowseModels } from "metabase/browse";
import {
createMockModelResult,
createMockRecentModel,
} from "metabase/browse/models/test-utils";
-import { createMockSetupState } from "metabase/redux/store/mocks";
import type { RecentCollectionItem } from "metabase-types/api";
import {
createMockCollection,
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx
index da7aa198fe8..a3d2b02b659 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.unit.spec.tsx
@@ -4,13 +4,13 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import {
changeInput,
getCacheStrategySelect,
selectCacheStrategy,
} from "metabase/admin/performance/components/test-utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.unit.spec.tsx
index 9affa93cfdd..c4dcb63c629 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.unit.spec.tsx
@@ -4,6 +4,7 @@ import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupTokenStatusEndpoint } from "__support__/server-mocks";
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
mockGetBoundingClientRect,
@@ -12,7 +13,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
CacheConfig,
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
index 5050b10e4ff..ee928efe5a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
@@ -2,9 +2,9 @@ import {
setupAuditInfoEndpoint,
setupCollectionByIdEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection, CollectionId } from "metabase-types/api";
import { createMockCollection, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/utils.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/collections/utils.unit.spec.tsx
index d08d7a2713a..f338ccf2294 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/utils.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/utils.unit.spec.tsx
@@ -2,9 +2,9 @@ import { renderHook } from "@testing-library/react";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { createMockModelResult } from "metabase/browse/models/test-utils";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockCollection,
createMockTokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx
index 24cf92d6ec0..b26ce966f76 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/CreateMenu.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks/state";
import type { EnterpriseSettings } from "metabase-types/api";
import {
createMockTokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx
index 5a8f3d36af4..2e1d656c036 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupUpdateCollectionEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockCollection,
createMockTokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx
index 3bcca8075aa..50624e5ddcc 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/PublishTableModal.unit.spec.tsx
@@ -10,9 +10,9 @@ import {
setupTableSelectionInfoEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { OmniPickerItem } from "metabase/common/components/Pickers";
-import { createMockState } from "metabase/redux/store/mocks";
import type { BulkTableSelectionInfo } from "metabase-types/api";
import {
createMockBulkTableInfo,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx
index a578d0f10da..e83dbb56663 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/RootSnippetsCollectionMenu.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupGroupsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks/state";
import { Route } from "metabase/router";
import { dataStudioArchivedSnippets } from "metabase/urls";
import type { EnterpriseSettings } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
index 7dd01043bb1..6c8ecf116d0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.unit.spec.tsx
@@ -11,8 +11,8 @@ import {
setupTableSelectionInfoEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
BulkTableSelectionInfo,
DatabaseId,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
index 06a55cd5cc2..d791aecb034 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
@@ -2,8 +2,8 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { setupCollectionByIdEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
EnterpriseSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
index b150d2747c0..916759fbb26 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
@@ -5,8 +5,8 @@ import {
setupNativeQuerySnippetEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
EnterpriseSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
index 2d8df99333f..5ca0d48b8a9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.unit.spec.tsx
@@ -12,9 +12,9 @@ import {
setupTableEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { CollectionPickerModalProps } from "metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { EnterpriseSettings, TokenFeatures } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
index c858db2e723..a768120db50 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
@@ -1,8 +1,8 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
EnterpriseSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
index 7d5573f4964..c8e87beb43c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
@@ -1,8 +1,8 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
EnterpriseSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.unit.spec.tsx
index fd2b95eff0f..b82536de749 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppSkillsSection/DataAppSkillsSection.unit.spec.tsx
@@ -1,10 +1,7 @@
import userEvent from "@testing-library/user-event";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { createMockVersion } from "metabase-types/api/mocks";
import { DataAppSkillsSection } from "./DataAppSkillsSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.unit.spec.tsx
index 7266064b878..a1001727d09 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationSection.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { DatabaseFeature } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.unit.spec.tsx
index 6dac1d3b8cc..54ba9d60972 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { DatabaseReplicationStatusInfo } from "./DatabaseReplicationStatusInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx
index d44b3bbff8d..bb3f9dc9ec5 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.unit.spec.tsx
@@ -3,8 +3,8 @@ import {
setupListTransformsEndpoint,
setupUserAttributesEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { Database } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.unit.spec.tsx
index e90b991026b..8fc565cc62f 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.unit.spec.tsx
@@ -1,10 +1,10 @@
import userEvent from "@testing-library/user-event";
import { setupDatabaseEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
import { useListDatabasesQuery } from "metabase/api";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database } from "metabase-types/api";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.unit.spec.tsx
index a68642e6834..aa5f911ca37 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { GdrivePayload } from "metabase-types/api";
import {
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveDbMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveDbMenu.unit.spec.tsx
index cb6ea4887fe..221bb993bf1 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveDbMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveDbMenu.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupGdriveServiceAccountEndpoint,
setupGdriveSyncEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { act, renderWithProviders, screen } from "__support__/ui";
import { dayjs } from "metabase/dayjs";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { Settings } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
index ca4af8bdfb2..43df49f480d 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
@@ -7,10 +7,10 @@ import {
setupGdriveServiceAccountEndpoint,
setupTablesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
import { useListDatabasesQuery, useListTablesQuery } from "metabase/api";
import { useDispatch } from "metabase/redux";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { EnterpriseApi } from "metabase-enterprise/api/api";
import type { GdrivePayload } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.unit.spec.tsx
index 1fe79698c34..e16bb322edc 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.unit.spec.tsx
@@ -1,6 +1,6 @@
import { setupDatabaseEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockDatabase,
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.unit.spec.tsx
index ce498ffccff..06529c0ef8e 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupTokenStatusEndpoint,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { dayjs } from "metabase/dayjs";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type {
BillingInfo,
BillingInfoLineItem,
diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
index 83295c31c3e..97caa7203b2 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupTokenStatusEndpointEmpty,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import * as domUtils from "metabase/utils/dom";
import type { User } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/AIProviderListUsage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/AIProviderListUsage.unit.spec.tsx
index c72771a91cd..ed69310a796 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/AIProviderListUsage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/AIProviderListUsage.unit.spec.tsx
@@ -11,10 +11,10 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
import { AIProviderList } from "metabase/metabot";
import { reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockLlmProviderConnection,
createMockLlmProviderType,
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx
index 5153550c8e9..6f04274629a 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.unit.spec.tsx
@@ -8,9 +8,9 @@ import {
setupPropertiesEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import type { MetabotUsageResponse } from "metabase-enterprise/api";
import type { TokenStatusFeature } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
index 5fc5ac05006..49fe7b474ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/EntityModerationIcon/EntityModerationIcon.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockModerationReview,
createMockTokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.unit.spec.tsx
index 6407828fe45..c62d085bd49 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/cli-analytics/components/CliAnalyticsSectionLayout.unit.spec.tsx
@@ -7,6 +7,7 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -14,7 +15,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route, redirect } from "metabase/router";
import * as Urls from "metabase/urls";
import { registerVisualizations } from "metabase/visualizations/register";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx
index 555f1992859..d5a73c72860 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/components/AvailabilityLayouts/AvailabilityLayouts.unit.spec.tsx
@@ -1,8 +1,8 @@
import type { ReactElement } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx
index 651ec4d6900..c98c32e6265 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/mcp-analytics/components/McpAnalyticsSectionLayout.unit.spec.tsx
@@ -7,6 +7,7 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -14,7 +15,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route, redirect } from "metabase/router";
import * as Urls from "metabase/urls";
import { registerVisualizations } from "metabase/visualizations/register";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsx
index 3b052927bdc..3df73fd86c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/ConversationFilters.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { ConversationFilters } from "./ConversationFilters";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts
index 8a1b3dacaff..abd7d9b526e 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts
@@ -5,8 +5,8 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Group } from "metabase-types/api";
import {
createMockGroup,
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
index 9d288e2b089..41ebfdaa505 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { parseSearchQuery } from "metabase/utils/browser";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx
index 21c09c675c7..3afb9f09c3e 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationsPage/ConversationsPage.unit.spec.tsx
@@ -10,6 +10,7 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -17,7 +18,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { parseSearchQuery } from "metabase/utils/browser";
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx
index da3846a60ad..a3f5844f644 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/routes.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type * as Router from "metabase/router";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/AccountSecurityPanel.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/AccountSecurityPanel.unit.spec.tsx
index 0708f263694..20ea39fd141 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/AccountSecurityPanel.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AccountSecurityPanel/AccountSecurityPanel.unit.spec.tsx
@@ -5,12 +5,12 @@ import {
setupMfaStatusEndpointError,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { MfaStatus } from "metabase-types/api";
import {
createMockMfaStatus,
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.unit.spec.tsx
index 60580bfd088..f732b71cb33 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/AdminAuthCard/AdminAuthCard.unit.spec.tsx
@@ -4,8 +4,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { MfaAdminOverview } from "metabase-types/api";
import {
createMockMfaAdminOverview,
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.unit.spec.tsx
index c5a2e290043..acca261f952 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/EnrolledUsersPage/EnrolledUsersPage.unit.spec.tsx
@@ -6,13 +6,13 @@ import {
setupMfaEnrolledUsersEndpoint,
setupMfaEnrolledUsersEndpointError,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
screen,
waitFor,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { MfaEnrolledUser } from "metabase-types/api";
import {
createMockMfaEnrolledUser,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.unit.spec.tsx
index bad149b9fbd..c8b226746b7 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.unit.spec.tsx
@@ -1,8 +1,8 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupCollectionTreeEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { TRANSFORMS_ROOT_ID } from "metabase-enterprise/remote_sync/displayGroups";
import type { Collection, RemoteSyncEntity } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx
index dd3af97ba2b..70a3aa6f7f9 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.unit.spec.tsx
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
index 86878d73098..2f819521b35 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.unit.spec.tsx
@@ -4,8 +4,8 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupRemoteSyncEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockTokenFeatures,
createMockUser,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/test-utils.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/test-utils.ts
index 05545b4eeb1..5c9fd2f4ed4 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/test-utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/test-utils.ts
@@ -5,7 +5,7 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import type { RemoteSyncEntity } from "metabase-types/api";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.setup.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.setup.spec.tsx
index 2a01d8369b4..4a8379b448d 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.setup.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.setup.spec.tsx
@@ -8,8 +8,8 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
Collection,
CollectionItem,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.stories.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.stories.tsx
index 27067ccf117..b389347c0ba 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.stories.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.stories.tsx
@@ -1,5 +1,5 @@
+import { createMockState } from "__support__/state";
import { ReduxProvider } from "__support__/storybook";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { SyncProgressModal } from "./SyncProgressModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.unit.spec.tsx
index bde046a7561..e8553949e9a 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.unit.spec.tsx
@@ -4,8 +4,8 @@ import {
findRequests,
setupRemoteSyncCancelTaskEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { RemoteSyncOutcome } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
index f8c78c9c2e4..2eee798e480 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/TopLevelCollectionsList/TopLevelCollectionsList.unit.spec.tsx
@@ -4,9 +4,9 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { Form, FormProvider, FormSubmitButton } from "metabase/forms";
-import { createMockState } from "metabase/redux/store/mocks";
import type { CollectionSyncPreferences } from "metabase-types/api";
import {
createMockCollectionItem,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.unit.spec.ts
index 75f60f860c7..19e1e769c9e 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.unit.spec.ts
@@ -3,8 +3,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
index 657d3af916a..3123f29267d 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.unit.spec.ts
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection, RemoteSyncEntity } from "metabase-types/api";
import {
createMockCollection,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.unit.spec.ts
index 366fa131d06..8b4a345ca90 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.unit.spec.ts
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { TRANSFORMS_ROOT_ID } from "metabase-enterprise/remote_sync/utils";
import type { Collection, RemoteSyncEntity } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
index f9925767764..e581cb68a1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-dirty-state.unit.spec.ts
@@ -4,8 +4,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { RemoteSyncEntity } from "metabase-types/api";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts
index 6052339ebec..e91f382eba5 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/collection.unit.spec.ts
@@ -1,7 +1,7 @@
import { QueryStatus } from "@reduxjs/toolkit/query";
+import { createMockState } from "__support__/state";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts
index 23cc07c6deb..954dddc3c5f 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/middleware/remote-sync-listener-middleware.unit.spec.ts
@@ -9,11 +9,11 @@ import {
setupRemoteSyncDirtyEndpoint,
setupUpdateCollectionEndpoint,
} from "__support__/server-mocks";
+import { seedApiQueryCache } from "__support__/state";
import { Api } from "metabase/api";
import { cardApi } from "metabase/api/card";
import { collectionApi } from "metabase/api/collection";
import { dashboardApi } from "metabase/api/dashboard";
-import { seedApiQueryCache } from "metabase/redux/store/mocks";
import { remoteSyncApi } from "metabase-enterprise/api/remote-sync";
import type { EnterpriseSettings } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.unit.spec.tsx
index 88ecb4f35b3..d3e827aebc5 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockState } from "__support__/state";
import { PLUGIN_DATA_PERMISSIONS, reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import type { GroupTableAccessPolicy } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx
index 2a6b71004cf..052bb64baf4 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/AdvisoryCard/AdvisoryCard.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { Advisory } from "metabase-types/api";
import { createMockVersion } from "metabase-types/api/mocks";
import { createAdvisory } from "metabase-types/api/mocks/security-center";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/EmailChannelCard/EmailChannelCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/EmailChannelCard/EmailChannelCard.unit.spec.tsx
index afcfde92ab5..3ec064851ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/EmailChannelCard/EmailChannelCard.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/EmailChannelCard/EmailChannelCard.unit.spec.tsx
@@ -1,6 +1,6 @@
import { setupRecentViewsAndSelectionsEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import type { NotificationConfig } from "../../../hooks/use-notification-config";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.unit.spec.tsx
index ffb40743efe..0bed4495eb8 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupUserRecipientsEndpoint,
} from "__support__/server-mocks";
import { findRequests } from "__support__/server-mocks/util";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
import {
createMockEmailChannelSpec,
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx
index 479c2979d1f..e1038b7fdcb 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterBanner/SecurityCenterBanner.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Advisory } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
index 243fd62c8d7..1897e2deaf7 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { setupRecentViewsAndSelectionsEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Advisory } from "metabase-types/api";
import { createMockVersion } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx
index e24b72db832..2876027c70c 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPromoCard/SecurityCenterPromoCard.unit.spec.tsx
@@ -3,9 +3,9 @@ import fetchMock from "fetch-mock";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { securityCenterApi, subscriptionApi } from "metabase/api";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Advisory } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.unit.spec.tsx
index 2f2a83b460e..7c0f405a8ac 100644
--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.unit.spec.tsx
@@ -5,11 +5,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
SearchEngineSettingValue,
TokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/settings/selectors.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/settings/selectors.unit.spec.ts
index d31ef0ee883..64305b25c3a 100644
--- a/enterprise/frontend/src/metabase-enterprise/settings/selectors.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/settings/selectors.unit.spec.ts
@@ -1,7 +1,4 @@
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { getIsWhiteLabeling, getLoadingMessage, getLogoUrl } from "./selectors";
diff --git a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.unit.spec.tsx
index ef255f3de09..5df62eba9d0 100644
--- a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/SMTPOverrideConnectionForm.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/SMTPOverrideConnectionForm.unit.spec.tsx
index 85e03ea0625..0ce4ded7972 100644
--- a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/SMTPOverrideConnectionForm.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/SMTPOverrideConnectionForm.unit.spec.tsx
@@ -6,11 +6,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
EnterpriseSettingKey,
SettingDefinition,
diff --git a/enterprise/frontend/src/metabase-enterprise/storage/CSVPanel.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/storage/CSVPanel.unit.spec.tsx
index 062b5d4594e..ef70cd58abe 100644
--- a/enterprise/frontend/src/metabase-enterprise/storage/CSVPanel.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/storage/CSVPanel.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupTokenRefreshEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
act,
renderWithProviders,
@@ -19,7 +20,6 @@ import {
import { useListDatabasesQuery } from "metabase/api";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { CSVPanel } from "metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
Database,
ICloudAddOnProduct,
diff --git a/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.unit.spec.tsx
index e9de7b9c57f..d996d240205 100644
--- a/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.unit.spec.tsx
@@ -7,6 +7,7 @@ import {
setupTokenRefreshEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
act,
renderWithProviders,
@@ -18,7 +19,6 @@ import { Api } from "metabase/api";
import { listTag } from "metabase/api/tags";
import { UndoListing } from "metabase/common/components/UndoListing";
import { useStorageSetup } from "metabase/common/components/upsells/StoragePurchaseModal";
-import { createMockState } from "metabase/redux/store/mocks";
import type { ICloudAddOnProduct, TokenFeatures } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.unit.spec.tsx
index 00618fc8e39..07e43f5140f 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.unit.spec.tsx
@@ -7,11 +7,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx
index 757d2547da6..f749993ef64 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupCardDataset,
setupFieldEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { waitFor } from "__support__/ui";
import { MetabaseReduxProvider } from "metabase/redux";
-import { createMockState } from "metabase/redux/store/mocks";
import { getStore } from "metabase/store";
import type { FieldId, RowValue } from "metabase-types/api";
import { createMockField, createMockTable } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalPeopleListingApp/ExternalPeopleListingApp.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalPeopleListingApp/ExternalPeopleListingApp.unit.spec.tsx
index 8d3dd672996..edf1d88af5a 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalPeopleListingApp/ExternalPeopleListingApp.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/ExternalPeopleListingApp/ExternalPeopleListingApp.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Tenant, User } from "metabase-types/api";
import {
createMockTenant,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.unit.spec.tsx
index 0e90c38e921..f3fb3237bf2 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupCollectionsEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection } from "metabase-types/api";
import { createMockCollection, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
index 97ddbb85216..cb6450d7590 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
@@ -1,11 +1,11 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
-import type { State } from "metabase/redux/store";
import {
createMockAdminState,
createMockPermissionsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import type { State } from "metabase/redux/store";
import type { CollectionPermissions } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx
index 1abf8ca28b2..d1e60f6b576 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.unit.spec.tsx
@@ -1,8 +1,8 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupTenantEntpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Tenant } from "metabase-types/api";
import {
createMockTenant,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.unit.spec.tsx
index c1e4cac81e0..63f0debf611 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformEditor.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSearchEndpoints,
setupTablesEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { PythonTransformEditorUiOptions } from "metabase/plugins/oss/transforms";
-import { createMockState } from "metabase/redux/store/mocks";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import type { PythonTransformSourceDraft, Transform } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx
index 6ab22f77600..5f6221f2469 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.unit.spec.tsx
@@ -2,8 +2,8 @@ import {
setupDatabasesEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Transform } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx
index c4bbc39ff2d..844750a2bd7 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PurchaseAdvancedTransforms.unit.spec.tsx
@@ -2,11 +2,8 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { setupPropertiesEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx
index 813b34ec4dc..f9e1ad4dce9 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/tests/setup.tsx
@@ -6,8 +6,8 @@ import {
setupStoreEECloudAddOnsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts
index 9f69c3a3396..11ff1e571b6 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.unit.spec.ts
@@ -3,8 +3,8 @@ import {
setupPropertiesEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
import type { AddOnProductType } from "metabase-types/api/store";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx
index 95f581a0efa..f6a51ffa1ab 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.setup.spec.tsx
@@ -4,11 +4,8 @@ import {
setupDatabaseListEndpoint,
setupPropertiesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.unit.spec.tsx
index 49347a66428..58a7d05feaf 100644
--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioning.unit.spec.tsx
@@ -7,12 +7,12 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import {
createMockSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx
index 6258fd2359d..da1c36d94c7 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontWidget.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx
index 0f7b76e88b7..388b61e2c93 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/HelpLinkSettings/HelpLinkSettings.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx
index 313e411205e..ff4e61abb5e 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type {
EnterpriseSettingKey,
EnterpriseSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx
index 5b6ba818373..83407b1634f 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
jest.mock("metabase/css/core/index.css", () => ({
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx
index 160040c429a..b071c04a6dd 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { MetabotToggleWidget } from "./MetabotToggleWidget";
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 1cd558701ef..fff16de0a04 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1253,11 +1253,6 @@ const configs = [
"frontend/src/**/*.{ts,tsx,js,jsx}",
"enterprise/frontend/src/**/*.{ts,tsx,js,jsx}",
],
- ignores: [
- // TODO(no-base-api-access): createMockState composes the whole store, so redux/store/mocks belongs in test support.
- // It moves there when the store roots are composed explicitly, and this ignore goes with it.
- "frontend/src/metabase/redux/store/mocks/api.ts",
- ],
rules: {
"metabase/no-base-api-access": [
"error",
diff --git a/frontend/lint/side-effect-files.json b/frontend/lint/side-effect-files.json
index ae480ec94ca..88d4b68ccb1 100644
--- a/frontend/lint/side-effect-files.json
+++ b/frontend/lint/side-effect-files.json
@@ -160,7 +160,6 @@
"frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx": "self",
"frontend/src/metabase/redux/embed/embed.ts": "self",
"frontend/src/metabase/redux/hooks.ts": "self",
- "frontend/src/metabase/redux/store/mocks/api.ts": "self",
"frontend/src/metabase/redux/utils.ts": "self",
"frontend/src/metabase/rich_text_editing/tiptap/extensions/Blockquote/Blockquote.tsx": "self",
"frontend/src/metabase/rich_text_editing/tiptap/extensions/BulletList/BulletList.tsx": "self",
diff --git a/frontend/lint/tests/no-base-api-access.unit.spec.js b/frontend/lint/tests/no-base-api-access.unit.spec.js
index 66cbcc77cd8..40a646673dc 100644
--- a/frontend/lint/tests/no-base-api-access.unit.spec.js
+++ b/frontend/lint/tests/no-base-api-access.unit.spec.js
@@ -289,7 +289,7 @@ const INVALID_CASES = [
},
{
name: "cache seeding in a product file named api.ts",
- filename: "/repo/frontend/src/metabase/redux/store/mocks/api.ts",
+ filename: "/repo/frontend/src/metabase/redux/store/api.ts",
options,
code: `
import { Api } from "metabase/api";
diff --git a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
index b8d7ff09e60..0ac73a4d4f8 100644
--- a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
+++ b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
@@ -1,6 +1,6 @@
+import { seedApiQueryCache } from "__support__/state";
+import { createMockState } from "__support__/state/state";
import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";
-import { seedApiQueryCache } from "metabase/redux/store/mocks";
-import { createMockState } from "metabase/redux/store/mocks/state";
import type { EnterpriseSettings } from "metabase-types/api";
import {
createMockSettings,
diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/PublicComponentWrapper.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/PublicComponentWrapper.unit.spec.tsx
index f527f2d85fa..b72c026de5c 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/PublicComponentWrapper.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/PublicComponentWrapper.unit.spec.tsx
@@ -1,5 +1,6 @@
import { act } from "@testing-library/react";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { sdkReducers } from "embedding-sdk-bundle/store";
import { setPluginsReady } from "embedding-sdk-bundle/store/reducer";
@@ -8,7 +9,6 @@ import {
createMockSdkState,
} from "embedding-sdk-bundle/test/mocks/state";
import type { LoginStatus } from "embedding-sdk-bundle/types/user";
-import { createMockState } from "metabase/redux/store/mocks";
import { PublicComponentWrapper } from "./PublicComponentWrapper";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
index 9fbcc7aaaba..d6cd2211c6c 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
@@ -5,6 +5,7 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { screen, within } from "__support__/ui";
import * as IsLocalhostModule from "embedding-sdk-bundle/lib/get-is-localhost";
import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";
@@ -13,7 +14,6 @@ import {
createMockSdkState,
createMockTokenState,
} from "embedding-sdk-bundle/test/mocks/state";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
index 982c0a766b3..0a8da163ec4 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
@@ -5,6 +5,7 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { screen, waitFor, within } from "__support__/ui";
import * as IsLocalhostModule from "embedding-sdk-bundle/lib/get-is-localhost";
import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";
@@ -17,7 +18,6 @@ import {
createMockTokenState,
} from "embedding-sdk-bundle/test/mocks/state";
import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/tests/setup.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/tests/setup.tsx
index 4c01226fc84..95dd38290fe 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/tests/setup.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/tests/setup.tsx
@@ -19,6 +19,7 @@ import {
} from "__support__/server-mocks";
import { setupDashcardQueryEndpoints } from "__support__/server-mocks/dashcard";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
+import { createMockDashboardState } from "__support__/state";
import { screen } from "__support__/ui";
import { SdkInternalNavigationProvider } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/SdkInternalNavigationProvider";
import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";
@@ -26,7 +27,6 @@ import { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";
import { setupSdkState } from "embedding-sdk-bundle/test/server-mocks/sdk-init";
import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";
import { useLocale } from "metabase/common/hooks/use-locale";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import type { DashboardCard, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
index d93755ef2b7..7b5c1beee3d 100644
--- a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
+++ b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
@@ -2,6 +2,8 @@ import { render } from "@testing-library/react";
import _ from "underscore";
import { getStore } from "__support__/entities-store";
+import { seedApiQueryCache } from "__support__/state";
+import { type StoreSeedState, createMockState } from "__support__/state";
import { ComponentProviderInternal } from "embedding-sdk-bundle/components/public/ComponentProvider";
import { sdkReducers } from "embedding-sdk-bundle/store";
import type { SdkStore } from "embedding-sdk-bundle/store/types";
@@ -10,11 +12,6 @@ import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { Api } from "metabase/api";
import { MetabaseReduxProvider } from "metabase/redux";
-import { seedApiQueryCache } from "metabase/redux/store/mocks";
-import {
- type StoreSeedState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { MantineThemeOverride } from "metabase/ui";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
diff --git a/frontend/src/embedding-sdk-bundle/test/server-mocks/sdk-init.ts b/frontend/src/embedding-sdk-bundle/test/server-mocks/sdk-init.ts
index 73b692b8508..ba9299cfb7c 100644
--- a/frontend/src/embedding-sdk-bundle/test/server-mocks/sdk-init.ts
+++ b/frontend/src/embedding-sdk-bundle/test/server-mocks/sdk-init.ts
@@ -4,15 +4,12 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockEmbedState, createMockState } from "__support__/state";
import type { SdkState, SdkStoreState } from "embedding-sdk-bundle/store/types";
import {
createMockLoginStatusState,
createMockSdkState,
} from "embedding-sdk-bundle/test/mocks/state";
-import {
- createMockEmbedState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
EnterpriseSettings,
SettingDefinition,
diff --git a/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx b/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx
index fabfb12ff69..398a9ff630c 100644
--- a/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx
+++ b/frontend/src/metabase/LoadCurrentUser.unit.spec.tsx
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
import { setupCurrentUserEndpoint } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.unit.spec.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.unit.spec.tsx
index f404c9d8dc7..d3dcf029b43 100644
--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.unit.spec.tsx
+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { User } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/account/password/containers/UserPasswordApp/tests/setup.tsx b/frontend/src/metabase/account/password/containers/UserPasswordApp/tests/setup.tsx
index 87226f7b203..595d4a33cab 100644
--- a/frontend/src/metabase/account/password/containers/UserPasswordApp/tests/setup.tsx
+++ b/frontend/src/metabase/account/password/containers/UserPasswordApp/tests/setup.tsx
@@ -1,8 +1,8 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupMfaStatusEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { MfaStatus, TokenFeatures, User } from "metabase-types/api";
import {
createMockMfaStatus,
diff --git a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.unit.spec.tsx b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.unit.spec.tsx
index f589678a034..fb024cefecb 100644
--- a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.unit.spec.tsx
+++ b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import type { UserProfileFormProps } from "./UserProfileForm";
diff --git a/frontend/src/metabase/account/profile/containers/UserProfileApp/tests/setup.tsx b/frontend/src/metabase/account/profile/containers/UserProfileApp/tests/setup.tsx
index c8c36a09a3e..a2c82dba7c6 100644
--- a/frontend/src/metabase/account/profile/containers/UserProfileApp/tests/setup.tsx
+++ b/frontend/src/metabase/account/profile/containers/UserProfileApp/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/test/setup.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/test/setup.tsx
index dd0107c647d..8fc1088751d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/test/setup.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/test/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/tests/setup.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/tests/setup.tsx
index f3a1d9394ba..5b7b3a47784 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/tests/setup.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
index 307d52fc1ef..132557994db 100644
--- a/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/AISettingsPage.unit.spec.tsx
@@ -19,11 +19,11 @@ import {
setupMetabotsEndpoints,
} from "__support__/server-mocks/metabot";
import { mockSettings } from "__support__/settings";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
import { buildDefaultMetabots } from "metabase/metabot/tests/utils";
import { reinitialize } from "metabase/plugins";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockCollection,
diff --git a/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx b/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx
index e4c06fa5111..d52796f799b 100644
--- a/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MCPServerUrlSection.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { McpServerUrlSection } from "./MCPServerUrlSection";
diff --git a/frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx b/frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx
index f6dace92a9c..3cc54de1a93 100644
--- a/frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/McpAppsSettings.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { McpAppsSettings } from "./McpAppsSettings";
diff --git a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
index 7c9da63b378..2b4e1df7382 100644
--- a/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotNavPane.unit.spec.tsx
@@ -2,9 +2,9 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { reinitialize } from "metabase/plugins";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
index 0deeb6c4435..843e8e03de9 100644
--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.unit.spec.tsx
@@ -18,6 +18,7 @@ import {
setupMetabotsEndpoints,
} from "__support__/server-mocks/metabot";
import { mockSettings } from "__support__/settings";
+import { createMockSettingsState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -31,7 +32,6 @@ import {
FIXED_METABOT_IDS,
} from "metabase/metabot/constants";
import { reinitialize } from "metabase/plugins";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { MetabotId, MetabotInfo, RecentItem } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx
index 0dddda48981..7d494935909 100644
--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.unit.spec.tsx
@@ -11,8 +11,8 @@ import {
setupSlackManifestEndpoint,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SlackAppInfo } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.unit.spec.tsx
index 2a2f14ce09e..a6cc0311b44 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupDatabaseEndpoints,
setupDatabaseUsageInfoEndpoint,
} from "__support__/server-mocks/database";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.unit.spec.tsx
index 3e6d2933da4..a616e538bd0 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupDatabaseEndpoints,
setupDatabaseUsageInfoEndpoint,
} from "__support__/server-mocks/database";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx
index a5a483d67cb..b5c00a06e82 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { DatabaseData } from "metabase-types/api";
import { createMockEngines } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx
index f950759235f..f6bdea85894 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.unit.spec.tsx
@@ -4,8 +4,8 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { EngineKey } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx
index 43b222cf5d5..7915c078387 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.unit.spec.tsx
@@ -1,10 +1,7 @@
import type { ReactNode } from "react";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockVersion } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.unit.spec.tsx
index 64ce3d1e696..9e452feab01 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupDatabaseEndpoints,
setupDatabaseUsageInfoEndpoint,
} from "__support__/server-mocks/database";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database } from "metabase-types/api";
import {
COMMON_DATABASE_FEATURES,
diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx
index 58232e91546..749e8539783 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.unit.spec.tsx
@@ -2,8 +2,8 @@ import { waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockEngines } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.unit.spec.tsx
index 289c869f33c..c9ea43290ed 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.unit.spec.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupTableEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx
index 81c7af325fb..ce150fc42e9 100644
--- a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockSettings,
diff --git a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.unit.spec.tsx b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.unit.spec.tsx
index 686e4f0c583..7ef1ff7d244 100644
--- a/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/components/ThemeEditor/PreviewPanel.unit.spec.tsx
@@ -3,8 +3,8 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSearchResult } from "metabase-types/api/mocks";
import { PreviewPanel } from "./PreviewPanel";
diff --git a/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.unit.spec.tsx b/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.unit.spec.tsx
index c85c2be3938..ff9a39c3cb3 100644
--- a/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/components/ThemeListing/EmbeddingThemeListingApp.unit.spec.tsx
@@ -1,7 +1,7 @@
import fetchMock from "fetch-mock";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.unit.spec.tsx b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.unit.spec.tsx
index 5f2de13489e..395366d766a 100644
--- a/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/hooks/use-default-embedding-theme-settings.unit.spec.tsx
@@ -1,6 +1,6 @@
+import { createMockState } from "__support__/state";
import { renderHookWithProviders } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { getColors } from "metabase/ui/colors/colors";
import type { ColorSettings } from "metabase-types/api/settings";
diff --git a/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.unit.spec.tsx b/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.unit.spec.tsx
index 8c1f9c1e5a4..1d2b95a8734 100644
--- a/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/hooks/use-embedding-theme-editor.unit.spec.tsx
@@ -1,9 +1,9 @@
import Color from "color";
import fetchMock from "fetch-mock";
+import { createMockState } from "__support__/state";
import { act, renderHookWithProviders, waitFor } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { performUndo } from "metabase/redux/undo";
import { suggestHarmonyColors } from "metabase/ui/colors/harmonies";
import type { EmbeddingTheme } from "metabase-types/api/embedding-theme";
diff --git a/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.unit.spec.tsx b/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.unit.spec.tsx
index 5454149413e..e98cf6c59da 100644
--- a/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.unit.spec.tsx
+++ b/frontend/src/metabase/admin/embedding/hooks/use-ensure-default-embedding-themes.unit.spec.tsx
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { useEnsureDefaultEmbeddingThemes } from "./use-ensure-default-embedding-themes";
diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.unit.spec.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.unit.spec.tsx
index df659aefce6..03742e85db0 100644
--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Group, Member } from "metabase-types/api";
import {
createMockTokenFeatures,
diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
index 8a6e4092c95..a2df2aa401c 100644
--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
@@ -1,12 +1,12 @@
-import { renderWithProviders, screen, within } from "__support__/ui";
-import { UpsellTenants } from "metabase/admin/upsells/UpsellTenants";
-import { createTenantsRouteGuard } from "metabase/admin/utils";
import {
createMockAdminAppState,
createMockAdminState,
createMockSettingsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen, within } from "__support__/ui";
+import { UpsellTenants } from "metabase/admin/upsells/UpsellTenants";
+import { createTenantsRouteGuard } from "metabase/admin/utils";
import { Route } from "metabase/router";
import type { EmbeddingHomepageStatus } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/people/containers/EditUserModal/test/setup.tsx b/frontend/src/metabase/admin/people/containers/EditUserModal/test/setup.tsx
index ff446abf40e..e804febc93f 100644
--- a/frontend/src/metabase/admin/people/containers/EditUserModal/test/setup.tsx
+++ b/frontend/src/metabase/admin/people/containers/EditUserModal/test/setup.tsx
@@ -3,9 +3,9 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupUserEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { User } from "metabase-types/api";
import {
createMockSettings,
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
index 7465d5b9af4..346974f425f 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Tenant, User } from "metabase-types/api";
import {
createMockGroup,
diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.unit.spec.tsx
index e8e5b61aad6..f56c50160c8 100644
--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupUserEndpoints,
} from "__support__/server-mocks/user";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
import { UserPasswordResetModal } from "./UserPasswordResetModal";
diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx
index a06d7751066..a22114047c4 100644
--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx
+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { useGetSettingsQuery } from "metabase/settings";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/performance/components/test-utils.tsx b/frontend/src/metabase/admin/performance/components/test-utils.tsx
index 6036ede8c4a..82d94475b25 100644
--- a/frontend/src/metabase/admin/performance/components/test-utils.tsx
+++ b/frontend/src/metabase/admin/performance/components/test-utils.tsx
@@ -10,6 +10,7 @@ import {
} from "__support__/server-mocks";
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
act,
@@ -18,7 +19,6 @@ import {
renderWithProviders,
screen,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { CacheConfig, TokenFeatures } from "metabase-types/api";
import { CacheDurationUnit } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx
index d9f5cea4e5a..1226656db31 100644
--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/tests/setup.tsx
@@ -6,8 +6,8 @@ import {
setupTokenStatusEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
Collection,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts
index 6b02038be95..babea8fc44a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts
@@ -1,6 +1,6 @@
import { QueryStatus } from "@reduxjs/toolkit/query";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
+import { createMockSettingsState } from "__support__/state";
import type { Database, SchemaName, TableId } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.ts
index f2a0ef35403..dd06c7f5f0b 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.ts
@@ -1,7 +1,7 @@
import { QueryStatus } from "@reduxjs/toolkit/query";
+import { createMockState } from "__support__/state";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
import { getPermissionsDatabase, getPermissionsDatabases } from "./databases";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx
index 53e9d04679e..8aa49659e80 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx
@@ -1,4 +1,3 @@
-import { createMockEntitiesState } from "__support__/store";
import {
createMockAdminState,
createMockApiState,
@@ -6,7 +5,8 @@ import {
createMockSettingsState,
createMockState,
seedApiQueryCache,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
import type { GroupsPermissions } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/admin/routes.unit.spec.tsx b/frontend/src/metabase/admin/routes.unit.spec.tsx
index 2c59e9c09a2..5ffc4501a96 100644
--- a/frontend/src/metabase/admin/routes.unit.spec.tsx
+++ b/frontend/src/metabase/admin/routes.unit.spec.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
import { getStore, mainReducers } from "__support__/entities-store";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
+import { createMockSettingsState } from "__support__/state";
import { type RouteObject, toRouteObjects } from "metabase/router";
import { getRoutes } from "./routes";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
index addda7c40b4..b96b681c2b9 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupBugReportingDetailsEndpoint,
setupPropertiesEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { getPlan, getSettings } from "metabase/settings";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/tests/setup.tsx b/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/tests/setup.tsx
index 23c9eb8bbc7..fe3a52949ea 100644
--- a/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/tests/setup.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/SMTPConnectionCard/tests/setup.tsx
@@ -4,9 +4,9 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { SMTPConnectionCard } from "metabase/admin/settings/components/Email/SMTPConnectionCard/SMTPConnectionCard";
-import { createMockState } from "metabase/redux/store/mocks";
import type { SettingKey, TokenFeatures } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.unit.spec.tsx
index 2e2deed3700..15a9d5193d3 100644
--- a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionCard.unit.spec.tsx
@@ -4,9 +4,9 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { SelfHostedSMTPConnectionCard } from "./SelfHostedSMTPConnectionCard";
diff --git a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.unit.spec.tsx
index ae6daeefe82..928b6d60c4e 100644
--- a/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/SelfHostedSMTPConnectionForm.unit.spec.tsx
@@ -6,11 +6,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
EnterpriseSettingKey,
SettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
index 07baa857e11..9836ce4d3de 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/tests/setup.tsx
@@ -10,10 +10,10 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { waitFor } from "__support__/ui";
import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Settings, TokenFeatures } from "metabase-types/api";
import {
createMockSettings,
diff --git a/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.unit.spec.tsx
index b96e886883e..6b6016c6a98 100644
--- a/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/GeneralSettings/DevInstanceBanner.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { DevInstanceBanner } from "./DevInstanceBanner";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx
index c15129f247e..e3c22819468 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { setupSettingEndpoint } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.unit.spec.tsx
index 4c5d7f0d740..3e804772de8 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.unit.spec.tsx
@@ -3,8 +3,8 @@ import {
setupSettingEndpoint,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { SettingKey } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx
index 2b031ff65aa..5e6e71cf665 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/EmailSettingsPage.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx
index dee4941984e..9b2ddc5b9f0 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/MapsSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/MapsSettingsPage.unit.spec.tsx
index 7c58a926b75..3636c61b74b 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/MapsSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/MapsSettingsPage.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockGeoJSONFeatureCollection,
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx
index 8d66e66869f..0b6309a4312 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/PublicSharingSettingsPage.unit.spec.tsx
@@ -10,9 +10,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.unit.spec.tsx
index 19d32cfab9f..d8771480f87 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/RemoteSyncSettingsPage.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx
index 7ff2a7115d5..2118431f110 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx
@@ -4,9 +4,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/test/AuthenticationSettingsPage.setup.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/test/AuthenticationSettingsPage.setup.tsx
index 74a33d6fd2b..0d1bfd96f52 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/test/AuthenticationSettingsPage.setup.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/test/AuthenticationSettingsPage.setup.tsx
@@ -7,10 +7,10 @@ import {
setupTokenStatusEndpoint,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
import type { AuthSettingsPageTab } from "metabase/plugins";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { ApiKey, EnterpriseSettings } from "metabase-types/api";
import {
createMockSettings,
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.unit.spec.tsx
index 62395d259ea..045caa57184 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
renderWithProviders,
@@ -18,7 +19,6 @@ import {
within,
} from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
index aa6406cd5c1..9e45da369dc 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
@@ -9,9 +9,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type {
CustomGeoJSONMap,
CustomGeoJSONSetting,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.unit.spec.tsx
index 1cda876c625..f6121b2e101 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/EmailFromAddressWidget.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx
index 49951dbb603..fb6d3fe8efb 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupSettingsEndpoints,
setupStatefulSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx
index ba2eff12abb..1f091320111 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/HomepageSetting.unit.spec.tsx
@@ -13,6 +13,7 @@ import {
setupSettingsEndpoints,
setupUpdateSettingsEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -22,7 +23,6 @@ import {
import { UndoListing } from "metabase/common/components/UndoListing";
import { useGetCurrentUserQuery } from "metabase/current-user";
import { PLUGIN_HOMEPAGE_SETTING } from "metabase/plugins";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockCollection,
createMockCollectionItem,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
index aec1fb535db..3925ef1b54f 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.unit.spec.tsx
index 7c227d15839..58dfa755bd1 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx
index 6dc95e7743c..1f8c5f5f5df 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/AnonymousTrackingInput.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupSettingsEndpoints,
setupStatefulSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx
index e76c4c9c455..f59da0f5e13 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/UsageTracking/CollectUserDataInput.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupSettingsEndpoints,
setupStatefulSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import {
createMockSettingDefinition,
createMockSettings,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx
index 5c382b248ad..621db9eea28 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx
@@ -4,9 +4,9 @@ import {
setupSettingsEndpoints,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { SettingKey } from "metabase-types/api";
import {
createMockSettingDefinition,
diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetup.unit.spec.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetup.unit.spec.tsx
index 2bbcd57a463..f2cb04d355c 100644
--- a/frontend/src/metabase/admin/settings/slack/SlackSetup.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/slack/SlackSetup.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupSlackManifestEndpoint,
setupSlackSettingsEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { SlackSetup } from "./SlackSetup";
diff --git a/frontend/src/metabase/admin/settings/tests/setup.tsx b/frontend/src/metabase/admin/settings/tests/setup.tsx
index 9eeb268481e..12c85c844ea 100644
--- a/frontend/src/metabase/admin/settings/tests/setup.tsx
+++ b/frontend/src/metabase/admin/settings/tests/setup.tsx
@@ -22,9 +22,9 @@ import {
} from "__support__/server-mocks";
import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { getTestStoreAndWrapper, screen } from "__support__/ui";
import { getSettingsRoutes } from "metabase/admin/settingsRoutes";
-import { createMockState } from "metabase/redux/store/mocks";
import { Outlet, Route } from "metabase/router";
import type { TokenFeature, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx
index 31793bb1d5e..548794c54b2 100644
--- a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx
+++ b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx
@@ -8,12 +8,6 @@ import {
setupDashboardEndpoints,
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
-import { renderWithProviders } from "__support__/ui";
-import { DEFAULT_INTERACTIVE_EMBEDDING_OPTIONS } from "metabase/redux/embed";
-import type {
- DashboardState,
- InteractiveEmbeddingOptions,
-} from "metabase/redux/store";
import {
createMockAppState,
createMockDashboardState,
@@ -21,7 +15,13 @@ import {
createMockEmbedState,
createMockQueryBuilderState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders } from "__support__/ui";
+import { DEFAULT_INTERACTIVE_EMBEDDING_OPTIONS } from "metabase/redux/embed";
+import type {
+ DashboardState,
+ InteractiveEmbeddingOptions,
+} from "metabase/redux/store";
import { Route } from "metabase/router";
import { modelToUrl } from "metabase/urls";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
index 653ffb0288d..12123e353a1 100644
--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
@@ -9,6 +9,12 @@ import {
setupSearchEndpoints,
setupSettingEndpoint,
} from "__support__/server-mocks";
+import {
+ createMockAppState,
+ createMockEmbedOptions,
+ createMockEmbedState,
+ createMockState,
+} from "__support__/state";
import {
act,
renderWithProviders,
@@ -22,12 +28,6 @@ import {
isNavbarOpenForPathname,
} from "metabase/redux/app";
import type { State } from "metabase/redux/store";
-import {
- createMockAppState,
- createMockEmbedOptions,
- createMockEmbedState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as iframeUtils from "metabase/utils/iframe";
import type { User } from "metabase-types/api";
diff --git a/frontend/src/metabase/app/selectors.unit.spec.ts b/frontend/src/metabase/app/selectors.unit.spec.ts
index 6e4e6b4b37e..a4482e8bc4b 100644
--- a/frontend/src/metabase/app/selectors.unit.spec.ts
+++ b/frontend/src/metabase/app/selectors.unit.spec.ts
@@ -1,4 +1,4 @@
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import type { Location } from "metabase/router";
import type { RouterProps } from "metabase/selectors/app";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx
index fc162a88dbb..2a2e3cf3efd 100644
--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx
+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.unit.spec.tsx
@@ -1,11 +1,8 @@
import userEvent from "@testing-library/user-event";
import { setupForgotPasswordEndpoint } from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { ForgotPassword } from "./ForgotPassword";
diff --git a/frontend/src/metabase/auth/components/Login/tests/setup.tsx b/frontend/src/metabase/auth/components/Login/tests/setup.tsx
index 4efd9bd6060..44338a3e3fb 100644
--- a/frontend/src/metabase/auth/components/Login/tests/setup.tsx
+++ b/frontend/src/metabase/auth/components/Login/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.unit.spec.tsx b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.unit.spec.tsx
index a1f5640f58a..8ba658c06a8 100644
--- a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.unit.spec.tsx
+++ b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { PasswordButton } from "./PasswordButton";
diff --git a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
index 7c5113f405a..7d135889df0 100644
--- a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
+++ b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
@@ -7,11 +7,8 @@ import {
setupLoginEndpoint,
setupPropertiesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import MetabaseSettings from "metabase/utils/settings";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx
index e23e6dcbac8..033b374a517 100644
--- a/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx
+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.unit.spec.tsx
@@ -1,13 +1,13 @@
import userEvent from "@testing-library/user-event";
import { setupDatabasesEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { BrowseSchemas } from "metabase/browse/schemas/BrowseSchemas";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Database } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/browse/metrics/tests/setup.tsx b/frontend/src/metabase/browse/metrics/tests/setup.tsx
index 356d30ecae9..444662af1e8 100644
--- a/frontend/src/metabase/browse/metrics/tests/setup.tsx
+++ b/frontend/src/metabase/browse/metrics/tests/setup.tsx
@@ -7,11 +7,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockSetupState, createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx
index 6aac70536d3..973944794b8 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupSearchEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSetupState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockSetupState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockCollection,
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx
index c352f7af2c2..f4ef7b819f3 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx
@@ -10,6 +10,7 @@ import {
setupNullGetUserKeyValueEndpoints,
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
act,
renderWithProviders,
@@ -17,10 +18,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { FileUploadStatus } from "metabase/status/components/FileUploadStatus/FileUploadStatus";
import {
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.unit.spec.tsx
index 56b5b7abde4..cdf56ac0a97 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.unit.spec.tsx
@@ -5,9 +5,9 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import CollectionEmptyState from "metabase/collections/components/CollectionEmptyState";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx
index 30150a2e69c..76006c93753 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/tests/setup.tsx
@@ -8,8 +8,8 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/collections/components/CollectionInfoSidebar/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionInfoSidebar/tests/setup.tsx
index 47194727b61..9f2dc98185e 100644
--- a/frontend/src/metabase/collections/components/CollectionInfoSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/collections/components/CollectionInfoSidebar/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx
index 34ff9a72954..f3db5d2db70 100644
--- a/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx
+++ b/frontend/src/metabase/collections/components/CollectionMenu/tests/setup.tsx
@@ -8,8 +8,8 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
Collection,
diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
index 150f064824a..07b4fd53816 100644
--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
@@ -2,13 +2,10 @@ import { screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { getIcon, queryIcon, renderWithProviders } from "__support__/ui";
import * as Analytics from "metabase/analytics";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Collection, CollectionItem, Database } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsx
index d10ef85d9bb..39cfa52121f 100644
--- a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsx
@@ -4,8 +4,8 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupUpdateCollectionEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks/state";
import type { Collection, EnterpriseSettings } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx
index 522449a01e5..5762183e91d 100644
--- a/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupCollectionByIdEndpoint,
setupUpdateCollectionEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection, CollectionItem } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsx
index f42d312e703..0bc5aaf3f31 100644
--- a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection, CollectionItem } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
index a1cd64c1077..5c9773decc8 100644
--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx
@@ -5,8 +5,8 @@ import {
setupCollectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
CollectionId,
diff --git a/frontend/src/metabase/common/collections/hooks.unit.spec.tsx b/frontend/src/metabase/common/collections/hooks.unit.spec.tsx
index ac98ff381c7..7726c3a4d28 100644
--- a/frontend/src/metabase/common/collections/hooks.unit.spec.tsx
+++ b/frontend/src/metabase/common/collections/hooks.unit.spec.tsx
@@ -1,9 +1,9 @@
import fetchMock from "fetch-mock";
import { setupCollectionByIdEndpoint } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection, CollectionId } from "metabase-types/api";
import { createMockCollection, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx
index af33bdfcc6f..211825d433f 100644
--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupDatabasesEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenStatus } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
index 7dfa4c2fb2c..db91e5c01f9 100644
--- a/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
+++ b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
@@ -8,8 +8,8 @@ import {
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenStatus } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx b/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx
index 64b55579502..b6ec945326a 100644
--- a/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx
@@ -1,7 +1,7 @@
import { fireEvent } from "@testing-library/react";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { TrialBanner } from "./TrialBanner";
diff --git a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.unit.spec.tsx b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.unit.spec.tsx
index 18c5607260b..41c27b0c2e8 100644
--- a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
import { CommunityLocalizationNotice } from "./CommunityLocalizationNotice";
diff --git a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
index 442c7bfcde0..b4e68856244 100644
--- a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
+++ b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
@@ -5,10 +5,10 @@ import { useState } from "react";
import { getCommonStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Stack, Text } from "metabase/ui";
import type { Database, DatabaseId } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.unit.spec.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.unit.spec.tsx
index dd14b01a77e..961e4100964 100644
--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.unit.spec.tsx
@@ -4,8 +4,8 @@ import fetchMock from "fetch-mock";
import { setupBugReportEndpoints } from "__support__/server-mocks/bug-report";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockCard,
createMockDatasetData,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
index f1700c7a02b..543105d8aad 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/QueryColumnFingerprintInfo.unit.spec.tsx
@@ -4,10 +4,10 @@ import {
setupFieldValuesEndpoint,
setupFieldsValuesEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { columnFinder } from "metabase-lib/test-helpers";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx
index 2b0e5bbd340..3e4175f1f5f 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import {
ORDERS,
PRODUCTS,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
index b58129d5641..e8ea28f2e97 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import { createMockField, createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
index 2646fe0531b..6f26b5ac827 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx
index bd83765357e..27ad7bfd3c9 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Table, TableId } from "metabase-types/api";
import {
createMockField,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon.unit.spec.tsx
index 96372da47b2..47938cf0a8f 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupTableEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { act, fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Table } from "metabase-types/api";
import { createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
index bf15694ed6b..c58ad8d4d0e 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import { createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx
index 97a65e2b956..36a834de563 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx
@@ -10,13 +10,13 @@ import {
setupRootCollectionItemsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
Collection,
CollectionItem,
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
index f09f881caa6..2627b9b0902 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.unit.spec.tsx
@@ -10,9 +10,9 @@ import {
setupLibraryEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
import { reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
Collection,
CollectionItem,
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
index c107fa738fc..26d9111b18f 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupRecentViewsAndSelectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { render, renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import type { Card, CollectionId, User } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
index 8f89c5401b2..cd78f48b45b 100644
--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx
@@ -14,6 +14,10 @@ import {
setupRecentViewsAndSelectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import {
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -24,10 +28,6 @@ import {
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";
import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";
-import {
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
index 4f38394c379..f28e322879d 100644
--- a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
+++ b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
@@ -5,11 +5,11 @@ import { t } from "ttag";
import { getPublicStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { LocaleProvider } from "metabase/embedding/LocaleProvider";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Schedule } from "./Schedule";
import { cronToBuilderValue } from "./cron";
diff --git a/frontend/src/metabase/common/components/Schedule/test-utils.tsx b/frontend/src/metabase/common/components/Schedule/test-utils.tsx
index 91ecda61379..96b7a759acf 100644
--- a/frontend/src/metabase/common/components/Schedule/test-utils.tsx
+++ b/frontend/src/metabase/common/components/Schedule/test-utils.tsx
@@ -2,9 +2,9 @@ import { useState } from "react";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import {
createMockSettings,
diff --git a/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx
index 21398611b3b..2d9961419da 100644
--- a/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/SearchResult/tests/SearchResult-Collections.unit.spec.tsx
@@ -4,6 +4,7 @@ import {
setupUserRecipientsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
getIcon,
queryIcon,
@@ -12,7 +13,6 @@ import {
} from "__support__/ui";
import { SearchResult } from "metabase/common/components/SearchResult";
import { reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
SearchResult as ApiSearchResult,
TokenFeatures,
diff --git a/frontend/src/metabase/common/components/UserForm.unit.spec.tsx b/frontend/src/metabase/common/components/UserForm.unit.spec.tsx
index 9bba122d1f9..3841ce60f60 100644
--- a/frontend/src/metabase/common/components/UserForm.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/UserForm.unit.spec.tsx
@@ -4,8 +4,8 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupTenantEntpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { GroupId, GroupInfo, Tenant, User } from "metabase-types/api";
import {
createMockGroup,
diff --git a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.unit.spec.tsx
index eeecea8460b..ea674a353b0 100644
--- a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/StoragePurchaseButton.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { mockStorageCloudAddOn } from "metabase-types/api/mocks/add-ons";
import { StoragePurchaseButton } from "./StoragePurchaseButton";
diff --git a/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx
index 36901d155f6..92d198eaa4e 100644
--- a/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/InsightsTabOrLink/tests/setup.tsx
@@ -1,9 +1,9 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupAuditInfoEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { Tabs } from "metabase/ui";
import {
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsx
index b4fc8976732..4c033c7c127 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/UpgradeModal.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
setupGetPlanEndpoint,
setupTrialAvailableEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { UpgradeModal } from "./UpgradeModal";
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx
index 0f381937ba1..1b6bebb1740 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.unit.spec.tsx
@@ -1,12 +1,9 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderHookWithProviders } from "__support__/ui";
import {
DATA_STUDIO_UPGRADE_URL,
UPGRADE_URL,
} from "metabase/common/components/upsells/constants";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { useUpgradeAction } from "./use-upgrade-action";
diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.unit.spec.tsx
index cd8a0caad37..6130896fb2e 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpsellCardContent.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupTrialAvailableEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import type { UpsellCardContentProps } from "./UpsellCardContent";
diff --git a/frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsx b/frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsx
index 098ec973e25..3a3403d8072 100644
--- a/frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/use-upsell-link.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/data-studio/selectors.unit.spec.ts b/frontend/src/metabase/common/data-studio/selectors.unit.spec.ts
index 37c625073bc..8a9cfc62ac5 100644
--- a/frontend/src/metabase/common/data-studio/selectors.unit.spec.ts
+++ b/frontend/src/metabase/common/data-studio/selectors.unit.spec.ts
@@ -1,4 +1,4 @@
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import { createMockUser } from "metabase-types/api/mocks";
import { canAccessDataStudio } from "./selectors";
diff --git a/frontend/src/metabase/common/hooks/use-attached-dwh.unit.spec.ts b/frontend/src/metabase/common/hooks/use-attached-dwh.unit.spec.ts
index 70f7bc1cd70..4fdaae9d974 100644
--- a/frontend/src/metabase/common/hooks/use-attached-dwh.unit.spec.ts
+++ b/frontend/src/metabase/common/hooks/use-attached-dwh.unit.spec.ts
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
import { setupDatabaseListEndpoint } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
import { useAttachedDwh } from "./use-attached-dwh";
diff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-get-personal-collection.unit.spec.tsx
index 8da0b40834b..4d867ccfb10 100644
--- a/frontend/src/metabase/common/hooks/use-get-personal-collection.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/use-get-personal-collection.unit.spec.tsx
@@ -2,8 +2,8 @@ import {
findRequests,
setupCollectionByIdEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { CollectionId } from "metabase-types/api";
import { createMockCollection, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.unit.spec.tsx
index e6320f4ae85..efe691ad20f 100644
--- a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import type { TokenFeature } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/hooks/use-help-link.unit.spec.ts b/frontend/src/metabase/common/hooks/use-help-link.unit.spec.ts
index 9d86798e650..880b36b8263 100644
--- a/frontend/src/metabase/common/hooks/use-help-link.unit.spec.ts
+++ b/frontend/src/metabase/common/hooks/use-help-link.unit.spec.ts
@@ -1,7 +1,7 @@
import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { HelpLinkSetting } from "metabase-types/api";
import {
createMockTokenStatus,
diff --git a/frontend/src/metabase/common/hooks/use-locale/use-locale.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-locale/use-locale.unit.spec.tsx
index c26f6c17483..9071794a7a8 100644
--- a/frontend/src/metabase/common/hooks/use-locale/use-locale.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/use-locale/use-locale.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { useLocale } from "./use-locale";
diff --git a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.unit.spec.tsx
index f8eda22bac5..a6b9d62776a 100644
--- a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.unit.spec.tsx
@@ -1,15 +1,12 @@
import userEvent from "@testing-library/user-event";
+import { createMockAppState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type {
TempStorage,
TempStorageKey,
TempStorageValue,
} from "metabase/redux/store";
-import {
- createMockAppState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { useTempStorage } from "./use-temp-storage";
diff --git a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts
index 54ae5428c99..be886a1d994 100644
--- a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts
+++ b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.unit.spec.ts
@@ -1,5 +1,5 @@
+import { createMockLocation } from "__support__/state";
import { act, renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockLocation } from "metabase/redux/store/mocks";
import type { Location } from "metabase/router";
import type { QueryParam } from "./types";
diff --git a/frontend/src/metabase/common/monitor/selectors.unit.spec.ts b/frontend/src/metabase/common/monitor/selectors.unit.spec.ts
index e067290fa57..3466cd8271c 100644
--- a/frontend/src/metabase/common/monitor/selectors.unit.spec.ts
+++ b/frontend/src/metabase/common/monitor/selectors.unit.spec.ts
@@ -1,4 +1,4 @@
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import { createMockUser } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/common/search/search-location/search-location.unit.spec.ts b/frontend/src/metabase/common/search/search-location/search-location.unit.spec.ts
index 3222df76cd1..1f8faee6608 100644
--- a/frontend/src/metabase/common/search/search-location/search-location.unit.spec.ts
+++ b/frontend/src/metabase/common/search/search-location/search-location.unit.spec.ts
@@ -1,10 +1,10 @@
+import { createMockLocation } from "__support__/state";
import {
getFiltersFromLocation,
getSearchTextFromLocation,
isSearchPageLocation,
} from "metabase/common/search";
import { SearchFilterKeys } from "metabase/common/search/constants";
-import { createMockLocation } from "metabase/redux/store/mocks";
describe("isSearchPageLocation", () => {
it("should return true for a search page location", () => {
diff --git a/frontend/src/metabase/content-translation/test-utils.ts b/frontend/src/metabase/content-translation/test-utils.ts
index 978bfb56e23..4ac7696136a 100644
--- a/frontend/src/metabase/content-translation/test-utils.ts
+++ b/frontend/src/metabase/content-translation/test-utils.ts
@@ -3,9 +3,9 @@ import type { ReactElement } from "react";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupContentTranslationEndpoints } from "__support__/server-mocks/content-translation";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import type { DictionaryArray, TokenFeatures } from "metabase-types/api";
import {
createMockTokenFeatures,
diff --git a/frontend/src/metabase/current-user/selectors.unit.spec.ts b/frontend/src/metabase/current-user/selectors.unit.spec.ts
index 46f4454f0c5..0bb16bca881 100644
--- a/frontend/src/metabase/current-user/selectors.unit.spec.ts
+++ b/frontend/src/metabase/current-user/selectors.unit.spec.ts
@@ -1,4 +1,4 @@
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import { createMockUser } from "metabase-types/api/mocks";
import { getUserAttributes, getUserIsAdmin } from "./selectors";
diff --git a/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsx b/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsx
index 3d27dee5bf7..5be3a9a3007 100644
--- a/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsx
+++ b/frontend/src/metabase/current-user/use-user-key-value.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupGetUserKeyValueEndpoint,
setupUpdateUserKeyValueEndpoint,
} from "__support__/server-mocks/user-key-value";
+import { createMockState } from "__support__/state";
import { waitFor } from "__support__/ui";
import { MetabaseReduxProvider } from "metabase/redux";
-import { createMockState } from "metabase/redux/store/mocks";
import type { UserKeyValue } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts b/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
index e2d78e39f11..058bf6495fb 100644
--- a/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/actions.unit.spec.ts
@@ -1,10 +1,10 @@
-import type { Dispatch, GetState } from "metabase/redux/store";
import {
createMockDashboardState,
createMockLocation,
createMockState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import type { Dispatch, GetState } from "metabase/redux/store";
import { navigate } from "metabase/router";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts b/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts
index b4530c77ca1..82cca1af622 100644
--- a/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts
@@ -9,11 +9,8 @@ import {
setupCardsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockDashboardState, createMockState } from "__support__/state";
import type { State, StoreDashcard } from "metabase/redux/store";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
CardId,
DashCardId,
diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
index 19f1e1384e3..e8ffe87023d 100644
--- a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
@@ -6,15 +6,15 @@ import {
setupDashboardsEndpoints,
setupDatabaseEndpoints,
} from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { Api } from "metabase/api";
-import type { DashboardState, State } from "metabase/redux/store";
-import type { StoreSeedState } from "metabase/redux/store/mocks";
+import type { StoreSeedState } from "__support__/state";
import {
createMockDashboardState,
createMockSettingsState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { Api } from "metabase/api";
+import type { DashboardState, State } from "metabase/redux/store";
import { isQuestionDashCard } from "metabase/utils/dashboard";
import type { Dashboard } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts
index 6530663a5ab..d7f0bff40d5 100644
--- a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts
@@ -1,12 +1,12 @@
import { getMainStore } from "__support__/entities-store";
import { setupFieldEndpoints } from "__support__/server-mocks";
-import { getParameters } from "metabase/dashboard/selectors";
-import type { State } from "metabase/redux/store";
import {
createMockDashboardState,
createMockState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { getParameters } from "metabase/dashboard/selectors";
+import type { State } from "metabase/redux/store";
import {
createMockCard,
createMockDashboardCard,
diff --git a/frontend/src/metabase/dashboard/actions/save.unit.spec.ts b/frontend/src/metabase/dashboard/actions/save.unit.spec.ts
index 7a479359399..b591dad82e2 100644
--- a/frontend/src/metabase/dashboard/actions/save.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/save.unit.spec.ts
@@ -2,13 +2,13 @@ import fetchMock from "fetch-mock";
import { getStore } from "__support__/entities-store";
import { setupDashboardQueryMetadataEndpoint } from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { Api } from "metabase/api";
import {
createMockDashboardState,
createMockSettingsState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { Api } from "metabase/api";
import {
createMockCard,
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/actions/tabs.unit.spec.ts b/frontend/src/metabase/dashboard/actions/tabs.unit.spec.ts
index 5fa674136ca..537ebfab084 100644
--- a/frontend/src/metabase/dashboard/actions/tabs.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/tabs.unit.spec.ts
@@ -1,12 +1,12 @@
import _ from "underscore";
import { getMainStore } from "__support__/entities-store";
-import type { StoreDashcard } from "metabase/redux/store";
import {
createMockDashboardState,
createMockState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import type { StoreDashcard } from "metabase/redux/store";
import type {
DashCardDataMap,
Parameter,
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/Action.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ActionViz/Action.unit.spec.tsx
index 3762a116924..f036d2a1506 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/Action.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/Action.unit.spec.tsx
@@ -7,6 +7,7 @@ import {
setupDatabasesEndpoints,
setupPrefetchDashcardValuesEndpoint,
} from "__support__/server-mocks";
+import { createMockDashboardState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
getIcon,
@@ -17,7 +18,6 @@ import {
within,
} from "__support__/ui";
import { getActionIsEnabledInDatabase } from "metabase/dashboard/utils";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type {
ActionDashboardCard,
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ExplainerText/tests/setup.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ExplainerText/tests/setup.tsx
index 8bb93e8cb42..8b99981a192 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ExplainerText/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ExplainerText/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
index a3b0fa45d06..c4d1cc7d195 100644
--- a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
@@ -5,14 +5,11 @@ import {
setupCollectionItemsEndpoint,
setupCollectionsEndpoints,
} from "__support__/server-mocks";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
// TODO: Move this to a more suitable location for sharing.
import type { Collection, CollectionItem, Dashboard } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
index 60689770464..29bed164433 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupRecentViewsAndSelectionsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockDashboardState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -17,7 +18,6 @@ import {
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";
import type { StoreDashboard } from "metabase/redux/store";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type {
CollectionItem,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.unit.spec.tsx
index f05a1690960..0424c5df385 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.unit.spec.tsx
@@ -1,11 +1,8 @@
import userEvent from "@testing-library/user-event";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { getDefaultTab } from "metabase/dashboard/actions";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { DashboardTab } from "metabase-types/api";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
index 90d91fe1903..1ca8560527e 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
@@ -4,15 +4,15 @@ import {
setupCardQueryDownloadEndpoint,
setupLastDownloadFormatEndpoints,
} from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { getIcon, renderWithProviders, screen } from "__support__/ui";
-import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { getMetadata } from "metabase/metadata-store";
import {
createMockDashboardState,
createMockState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { getIcon, renderWithProviders, screen } from "__support__/ui";
+import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
+import { getMetadata } from "metabase/metadata-store";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx
index d468c76ee1a..040606893cf 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.unit.spec.tsx
@@ -1,6 +1,7 @@
import userEvent from "@testing-library/user-event";
import { setupMetricDimensionsEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
getIcon,
@@ -10,7 +11,6 @@ import {
} from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
import type { ParameterMappingOption } from "metabase/parameters/utils/mapping-options";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import type { Card, VirtualCard } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/tests/setup.tsx
index e8b93fcde39..80f4f992b0d 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
import type { CardType, Parameter, TokenFeatures } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
index a9c7b2360df..e8e7f452ffd 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
@@ -4,6 +4,7 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
act,
@@ -22,10 +23,6 @@ import {
import * as dashboardSelectors from "metabase/dashboard/selectors";
import { registerDashboardVisualizations } from "metabase/dashboard/visualizations/register";
import { reinitialize } from "metabase/plugins";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
import { registerVisualizations } from "metabase/visualizations/register";
import {
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.unit.spec.tsx b/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.unit.spec.tsx
index 9faabe572ab..a9b829c5235 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.unit.spec.tsx
@@ -7,11 +7,11 @@ import {
setupCardQueryMetadataEndpoint,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, waitFor } from "__support__/ui";
import { serializeChartClipboard } from "metabase/common/utils/chart-clipboard";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
import { getDashcards } from "metabase/dashboard/selectors";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import type { Card } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
index 8314982c378..d1699766ba8 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
@@ -2,15 +2,15 @@ import userEvent from "@testing-library/user-event";
import { setupBookmarksEndpoints } from "__support__/server-mocks";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
+import {
+ createMockDashboardState,
+ createMockStoreDashboard,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, within } from "__support__/ui";
import type { DashboardActionKey } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/types";
import { DASHBOARD_APP_ACTIONS } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import {
- createMockDashboardState,
- createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { IconName } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx
index da777278f3e..d88f53c1def 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/tests/setup.tsx
@@ -3,13 +3,10 @@ import userEvent from "@testing-library/user-event";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { useSelector } from "metabase/redux";
import type { DashboardState } from "metabase/redux/store/dashboard";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx
index a37b8d48bec..c139f40c87d 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddFilterParameterButton/AddFilterParameterButton.unit.spec.tsx
@@ -1,11 +1,8 @@
import userEvent from "@testing-library/user-event";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { AddFilterParameterButton } from "./AddFilterParameterButton";
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx
index c4fd20ffc65..1ac01b7a2c2 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.unit.spec.tsx
@@ -3,9 +3,9 @@ import userEvent from "@testing-library/user-event";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.unit.spec.tsx
index d3e69fd0a8e..d86f9a43ca8 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.unit.spec.tsx
@@ -3,10 +3,10 @@ import userEvent from "@testing-library/user-event";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
import { getIsSharing } from "metabase/dashboard/selectors";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx
index 3a7cc94c438..959b5ec8253 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.unit.spec.tsx
@@ -1,9 +1,9 @@
import userEvent from "@testing-library/user-event";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
import type { SelectedTabId } from "metabase/redux/store";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx
index 3aac48393a9..f5004ea6564 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/tests/setup.tsx
@@ -6,11 +6,11 @@ import {
} from "__support__/server-mocks";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { getDefaultTab } from "metabase/dashboard/actions";
import { DASHBOARD_APP_ACTIONS } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/tests/setup.tsx
index 3d15fb7999a..f0a4b428b27 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/tests/setup.tsx
@@ -1,10 +1,10 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
type RenderWithProvidersOptions,
renderWithProviders,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsx
index f77ac3d8438..10435537bb5 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardPublicLinkPopover/DashboardPublicLinkPopover.unit.spec.tsx
@@ -4,8 +4,8 @@ import { useState } from "react";
import { setupDashboardPublicLinkEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import { createMockDashboard, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx
index e9871a21042..f8b479c857d 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/tests/setup.tsx
@@ -7,10 +7,10 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Dashboard, Settings, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx
index 7dbf3be27e0..0db9b2cad38 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/tests/setup.tsx
@@ -6,10 +6,10 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Dashboard, Settings } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/CaveatMessage/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/CaveatMessage/tests/setup.tsx
index 2a4822619de..d1350cd1009 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/CaveatMessage/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/CaveatMessage/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx
index 665715ec5d3..fa7af10a3db 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/AddEditSidebar/EmailAttachmentPicker.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { DashboardSubscription } from "metabase-types/api";
import { EmailAttachmentPicker } from "./EmailAttachmentPicker";
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx
index 6b6cefec387..ea9ecca8c70 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/tests/setup.tsx
@@ -6,16 +6,13 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupUserRecipientsEndpoint } from "__support__/server-mocks";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState, createMockState } from "__support__/state";
import type { Screen } from "__support__/ui";
import { renderWithProviders, screen } from "__support__/ui";
import { getNextId } from "__support__/utils";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
import { isEmbeddingSdk as mockIsEmbeddingSdk } from "metabase/embedding-sdk/config";
import type { SelectedTabId } from "metabase/redux/store";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Dashboard,
diff --git a/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
index efb029cf3f6..119bceb3bbe 100644
--- a/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.unit.spec.tsx
@@ -3,11 +3,8 @@
import userEvent from "@testing-library/user-event";
import _ from "underscore";
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { DashboardCard, DashboardTab } from "metabase-types/api";
import {
createMockActionDashboardCard,
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts
index 0763a39beca..2074d75a3be 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts
@@ -2,9 +2,9 @@ import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupCollectionTreeEndpoint } from "__support__/server-mocks/collection";
import { setupTenantEntpoints } from "__support__/server-mocks/tenant";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderHookWithProviders, waitFor } from "__support__/ui";
import getExpandedCollectionsById from "metabase/common/collections/getExpandedCollectionsById";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Collection, Tenant } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/dashboard/components/RefreshWidget/AutoRefreshMenuItem.unit.spec.tsx b/frontend/src/metabase/dashboard/components/RefreshWidget/AutoRefreshMenuItem.unit.spec.tsx
index 81ec80c435a..11820233d6d 100644
--- a/frontend/src/metabase/dashboard/components/RefreshWidget/AutoRefreshMenuItem.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/RefreshWidget/AutoRefreshMenuItem.unit.spec.tsx
@@ -1,9 +1,9 @@
import userEvent from "@testing-library/user-event";
import type { ReactNode } from "react";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Menu } from "metabase/ui";
import { createMockDashboard } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx
index c0540a8e509..b33f4f4c6ab 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx
@@ -4,6 +4,7 @@ import {
setupAutoDashboardEndpoints,
setupDatabaseListEndpoint,
} from "__support__/server-mocks";
+import { createMockDashboardState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
renderWithProviders,
@@ -11,7 +12,6 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.autoscroll.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.autoscroll.unit.spec.tsx
index 2ba04f9b421..96c74457987 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.autoscroll.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.autoscroll.unit.spec.tsx
@@ -10,6 +10,7 @@ import {
} from "__support__/server-mocks";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
act,
@@ -18,7 +19,6 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import {
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
index 4e9a018c5f2..b7438d4aa30 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
@@ -16,6 +16,7 @@ import {
} from "__support__/server-mocks";
import { setupNotificationChannelsEndpoints } from "__support__/server-mocks/pulse";
import { mockSettings } from "__support__/settings";
+import { createMockDashboardState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
act,
@@ -25,7 +26,6 @@ import {
} from "__support__/ui";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { Dashboard } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.unit.spec.tsx b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.unit.spec.tsx
index b61a44210bc..8e01776e697 100644
--- a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockDashboardState, createMockState } from "__support__/state";
import { renderHookWithProviders } from "__support__/ui";
-import {
- createMockDashboardState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { ClickObject } from "metabase/visualizations/types";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx
index f7f4050e487..06bdb50886d 100644
--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.unit.spec.tsx
@@ -1,14 +1,14 @@
import { act } from "@testing-library/react";
-import { renderHookWithProviders } from "__support__/ui";
-import { isEmbedPreview } from "metabase/embedding/config";
-import { selectTab } from "metabase/redux/dashboard";
import {
createMockDashboardState,
createMockSettingsState,
createMockState,
createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderHookWithProviders } from "__support__/ui";
+import { isEmbedPreview } from "metabase/embedding/config";
+import { selectTab } from "metabase/redux/dashboard";
import type { Location } from "metabase/router";
import { notifyLocationListeners, useIsNavigationHeld } from "metabase/router";
import type { ParameterValueOrArray } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/reducers.unit.spec.ts b/frontend/src/metabase/dashboard/reducers.unit.spec.ts
index c56cdf8b7a1..a9ed8701c52 100644
--- a/frontend/src/metabase/dashboard/reducers.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/reducers.unit.spec.ts
@@ -1,5 +1,5 @@
+import { createMockStoreDashboard } from "__support__/state";
import { INITIALIZE } from "metabase/redux/dashboard";
-import { createMockStoreDashboard } from "metabase/redux/store/mocks";
import { createMockDashboard } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/dashboard/selectors.unit.spec.ts b/frontend/src/metabase/dashboard/selectors.unit.spec.ts
index 5562add9e3b..2199bc7f072 100644
--- a/frontend/src/metabase/dashboard/selectors.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/selectors.unit.spec.ts
@@ -1,5 +1,11 @@
import { chain } from "icepick";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+ createMockStoreDashboard,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
getClickBehaviorSidebarDashcard,
@@ -14,12 +20,6 @@ import {
getSidebar,
} from "metabase/dashboard/selectors";
import type { State } from "metabase/redux/store";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
- createMockStoreDashboard,
-} from "metabase/redux/store/mocks";
import Field from "metabase-lib/v1/metadata/Field";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/utils.unit.spec.ts b/frontend/src/metabase/dashboard/utils.unit.spec.ts
index 6ac38c61edf..6cd8c171320 100644
--- a/frontend/src/metabase/dashboard/utils.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/utils.unit.spec.ts
@@ -1,3 +1,4 @@
+import { createMockLocation } from "__support__/state";
import {
canResetFilter,
createTabSlug,
@@ -13,7 +14,6 @@ import {
setDashboardHeaderParameterIndex,
syncParametersAndEmbeddingParams,
} from "metabase/dashboard/utils";
-import { createMockLocation } from "metabase/redux/store/mocks";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx
index f9ea118e92c..d05e721275e 100644
--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import { buildTextTagTarget } from "metabase-lib/v1/parameters/utils/targets";
import type {
Dashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
index fe28fb67888..5935cee3ad5 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
@@ -1,10 +1,10 @@
import userEvent from "@testing-library/user-event";
-import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import {
createMockDashboardState,
createMockSettingsState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import { registerVisualizations } from "metabase/visualizations/register";
import type { Parameter } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
index 608cae5bcb0..24e4ea3afc2 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
@@ -6,6 +6,7 @@ import {
setupSearchEndpoints,
setupUserRecipientsEndpoint,
} from "__support__/server-mocks";
+import { createMockDashboardState } from "__support__/state";
import {
fireEvent,
getIcon,
@@ -14,7 +15,6 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import * as iframeUtils from "metabase/utils/iframe";
import { registerVisualizations } from "metabase/visualizations/register";
import type {
diff --git a/frontend/src/metabase/dashboard/visualizations/Text/Text.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/Text/Text.unit.spec.tsx
index 7da07ee9412..6a9bcef4882 100644
--- a/frontend/src/metabase/dashboard/visualizations/Text/Text.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/Text/Text.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
+import { createMockDashboardState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockDashboardState } from "metabase/redux/store/mocks";
import type { ParameterValuesMap } from "metabase-types/api";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
index 69f38740cdf..a0e3ec3b623 100644
--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
@@ -2,6 +2,7 @@ import type { Meta, StoryFn } from "@storybook/react";
import { useCallback, useMemo, useState } from "react";
import { getPublicStore } from "__support__/entities-store";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { BaseCell } from "metabase/data-grid";
import { useDataGridInstance } from "metabase/data-grid/hooks/use-data-grid-instance";
import type {
@@ -9,10 +10,6 @@ import type {
RowIdColumnOptions,
} from "metabase/data-grid/types";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Checkbox, Flex } from "metabase/ui";
import { DataGrid } from "./DataGrid";
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
index e5353d80722..9195d01b33c 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/tests/setup.tsx
@@ -8,8 +8,8 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type {
Collection,
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
index 5b8df7f0db9..47c9e879f06 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.unit.spec.tsx
@@ -9,8 +9,8 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Database } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
index 7e84b59ee38..4ad0819843a 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -16,7 +17,6 @@ import {
waitFor,
} from "__support__/ui";
import { SelectionProvider } from "metabase/data-studio/data-model/pages/DataModel/contexts/SelectionContext";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Database, TokenFeatures, User } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
index d3b64b190b0..5209460ca1b 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/tests/setup.tsx
@@ -1,9 +1,9 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { EnterpriseSettings, Measure, Table } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
index b6ef00837e2..38e1db273f2 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/tests/setup.tsx
@@ -1,9 +1,9 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { EnterpriseSettings, Segment, Table } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx
index 61648876530..d27c912de6a 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableActionsMenu/TableActionsMenu.unit.spec.tsx
@@ -3,8 +3,8 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupListSourceReplacementRunsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Table } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
index 215c9852301..fa3654f4da8 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
@@ -6,9 +6,9 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { RouteParams } from "metabase/data-studio/data-model/pages/DataModel/types";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { DataStudioTableMetadataTab } from "metabase/urls";
import type {
diff --git a/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.unit.spec.tsx b/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.unit.spec.tsx
index 0b2710834e7..0716190cb1f 100644
--- a/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/guide/pages/GuidePage/GuidePage.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupUserKeyValueEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockSettings,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
index 186a6c45c82..516ed0b75eb 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx
@@ -1,12 +1,12 @@
import fetchMock from "fetch-mock";
import { setupMeasureRevisionsEndpoint } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Measure, Revision } from "metabase-types/api";
import {
createMockMeasure,
diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx
index 0b1501c8de2..8e196146b66 100644
--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupSchemaEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Table } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/data-studio/routes.unit.spec.tsx b/frontend/src/metabase/data-studio/routes.unit.spec.tsx
index aad05e4f217..1e7c37f82d2 100644
--- a/frontend/src/metabase/data-studio/routes.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/routes.unit.spec.tsx
@@ -1,7 +1,7 @@
import { lazyLoaders } from "__support__/lazy-routes";
import { setupUserKeyValueEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
index 28e4b5e57bd..011277dbba5 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.unit.spec.tsx
@@ -2,12 +2,12 @@ import {
setupSegmentRevisionsEndpoint,
setupSegmentRevisionsEndpointError,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Revision, Segment } from "metabase-types/api";
import {
createMockRevision,
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
index 3acf422efc1..3d4672ae006 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
@@ -4,11 +4,11 @@ import {
setupSegmentEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
import { DataModelSegmentBreadcrumbs } from "metabase/data-studio/segments/components/SegmentBreadcrumbs";
import { SegmentDetailPage } from "metabase/data-studio/segments/pages/SegmentDetailPage";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type {
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx
index edd017ebcf7..d1e62268f8b 100644
--- a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/SettingsPage.unit.spec.tsx
@@ -8,9 +8,9 @@ import {
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.unit.spec.tsx
index b5d77d29c3f..ae37346b2d8 100644
--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.unit.spec.tsx
@@ -1,14 +1,11 @@
import userEvent from "@testing-library/user-event";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import {
ELEVATED_ENGINES,
MAX_INITIAL_ENGINES_SHOWN,
} from "metabase/databases/constants";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Engine } from "metabase-types/api";
import { createMockEngine } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.stories.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.stories.tsx
index fc507531377..fb9e711e2d7 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.stories.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.stories.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { ReduxProvider } from "__support__/storybook";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { DatabaseForm } from "./DatabaseForm";
import { TEST_ENGINES } from "./tests/setup";
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/tests/engine-change.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseForm/tests/engine-change.unit.spec.tsx
index fe250f5278b..3332e8b02f5 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/tests/engine-change.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/tests/engine-change.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { useState } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { DatabaseData, Engine } from "metabase-types/api";
import { DatabaseForm } from "../DatabaseForm";
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/tests/setup.tsx b/frontend/src/metabase/databases/components/DatabaseForm/tests/setup.tsx
index 5f22f2e8266..3ed0ec3dc57 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/tests/setup.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
DatabaseData,
Engine,
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx
index 8e2f9cd6391..d313a95d96a 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockTokenFeatures,
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx
index c50661c4c23..822e878aa4b 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockTokenStatus } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.unit.spec.tsx
index ce4b19a0019..210f24ee968 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/DatabaseFormError.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { DatabaseFormError } from "./DatabaseFormError";
import {
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx
index bb9c2459ff2..ca9a9bfa2c8 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.unit.spec.tsx
@@ -2,12 +2,12 @@ import { Fragment } from "react";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderHookWithProviders,
renderWithProviders,
screen,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx
index 27cc56e99ac..749c2b6f891 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/utils.unit.spec.tsx
@@ -2,12 +2,12 @@ import { renderHook } from "@testing-library/react";
import type { PropsWithChildren } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderHookWithProviders,
renderWithProviders,
screen,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx
index 0abc1cc14d6..c9ceb7ae4b9 100644
--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx
+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.unit.spec.tsx
@@ -3,9 +3,9 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { setupCardDataset } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Table } from "metabase-types/api";
import { createMockForeignKey } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.unit.spec.tsx b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.unit.spec.tsx
index 0e0b0405a8c..81da465b93c 100644
--- a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.unit.spec.tsx
+++ b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.unit.spec.tsx
@@ -4,12 +4,12 @@ import {
setupDocumentRevisionsEndpoint,
setupUsersEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Document, Revision } from "metabase-types/api";
import {
createMockDocument,
diff --git a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
index 7eb897558f1..48e0d3c3780 100644
--- a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
+++ b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
@@ -4,6 +4,7 @@ import { HttpResponse, http } from "msw";
import { getCommonStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
ForceDocumentCardRenderDecorator,
@@ -11,7 +12,6 @@ import {
} from "__support__/storybook";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { LineChart } from "metabase/visualizations/visualizations/LineChart";
import { PieChart } from "metabase/visualizations/visualizations/PieChart";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx
index f4c4eedbe4a..10ef4c0ed0c 100644
--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/setup.tsx
@@ -7,12 +7,12 @@ import {
setupTokenStatusEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type {
EmbedResource,
EmbedResourceType,
} from "metabase/embedding/types";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
index 4ae066fc945..593be957c3c 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { useState } from "react";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { ExportFormat } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.unit.spec.tsx b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.unit.spec.tsx
index 338c4a861d0..ac76150935a 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { GroupId, GroupInfo, InviteTarget } from "metabase-types/api";
import { createMockGroup, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
index 4d223c47da5..649c8603e64 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHub.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
@@ -16,7 +17,6 @@ import {
waitFor,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockCollection,
createMockDashboard,
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx
index 9b1f74a6296..6709e488d90 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupSsoPage/SetupSsoPage.unit.spec.tsx
@@ -6,11 +6,8 @@ import {
setupPropertiesEndpoints,
setupUpdateSettingsEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx
index f0cba7073cb..9b4c97f2ec3 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/tests/test-setup.tsx
@@ -14,9 +14,9 @@ import {
setupUpdateSettingsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, waitFor } from "__support__/ui";
import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.unit.spec.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.unit.spec.tsx
index 9b144ca84da..0f725388471 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.unit.spec.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.unit.spec.tsx
@@ -1,6 +1,7 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { createMockState } from "__support__/state";
import {
fireEvent,
renderWithProviders,
@@ -9,7 +10,6 @@ import {
within,
} from "__support__/ui";
import { getHighlightedComment } from "metabase/explorations/selectors";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Comment, CommentContext, Timeline } from "metabase-types/api";
import { createMockTimeline, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.unit.spec.tsx b/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.unit.spec.tsx
index 56d1558b2ef..ad70a15164e 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.unit.spec.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.unit.spec.tsx
@@ -3,6 +3,7 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import {
trackExplorationAgentMessageSent,
@@ -16,7 +17,6 @@ import type {
MetabotMessage,
MetabotMessagePart,
} from "metabase/metabot/state";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
AddResearchGroupsResponse,
GetExplorationDataResponse,
diff --git a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.unit.spec.tsx b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.unit.spec.tsx
index 61ab191b7ab..1b06f3c9769 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.unit.spec.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.unit.spec.tsx
@@ -1,6 +1,7 @@
import userEvent from "@testing-library/user-event";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { useGetMyExplorationsQuery } from "metabase/api";
import {
@@ -15,7 +16,6 @@ import {
useMetabotAgent,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
-import { createMockState } from "metabase/redux/store/mocks";
import type { GetMyExplorationsResponse } from "metabase-types/api";
import { NewExplorationEntry } from "./NewExplorationEntry";
diff --git a/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts b/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts
index 9596f6896a9..3eefa395a95 100644
--- a/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts
+++ b/frontend/src/metabase/explorations/hooks/useExplorationSelection.unit.spec.ts
@@ -498,7 +498,7 @@ describe("useExplorationSelection", () => {
Api.util.upsertQueryEntries(
// RTK validates endpointName/value at runtime against the injected
// endpoint registry; TS can't pick the right union branch here (same
- // cast as `seedApiQueryCache` in metabase/redux/store/mocks/api.ts).
+ // cast as `seedApiQueryCache` in __support__/state/api.ts).
entries as unknown as Parameters<
typeof Api.util.upsertQueryEntries
>[0],
diff --git a/frontend/src/metabase/explorations/selectors.unit.spec.ts b/frontend/src/metabase/explorations/selectors.unit.spec.ts
index 5d8fd1cc64e..f3386eadeba 100644
--- a/frontend/src/metabase/explorations/selectors.unit.spec.ts
+++ b/frontend/src/metabase/explorations/selectors.unit.spec.ts
@@ -1,3 +1,4 @@
+import { createMockState } from "__support__/state";
import { setHighlightedComment } from "metabase/explorations/explorations.slice";
import {
createBlock,
@@ -5,7 +6,6 @@ import {
createPage,
createQuery,
} from "metabase/explorations/test-utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { getHighlightedForChildTarget, getQueriesById } from "./selectors";
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx
index f56d358b484..02485d21640 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/tests/setup.tsx
@@ -5,11 +5,8 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Settings, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.unit.spec.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.unit.spec.tsx
index 0edb5bef3d7..cccd219c522 100644
--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.unit.spec.tsx
+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.unit.spec.tsx
@@ -4,15 +4,12 @@ import {
setupPopularItemsEndpoints,
setupRecentViewsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
Database,
DatabaseXray,
diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.unit.spec.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.unit.spec.tsx
index ca942b5e5e0..2059a122535 100644
--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.unit.spec.tsx
+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { User } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/home/components/HomeHelpCard/tests/setup.tsx b/frontend/src/metabase/home/components/HomeHelpCard/tests/setup.tsx
index 7e5c7bb77e7..5f4a99e7c43 100644
--- a/frontend/src/metabase/home/components/HomeHelpCard/tests/setup.tsx
+++ b/frontend/src/metabase/home/components/HomeHelpCard/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.unit.spec.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.unit.spec.tsx
index b54c1b636bf..a58663a03ba 100644
--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.unit.spec.tsx
+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.unit.spec.tsx
@@ -1,5 +1,5 @@
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { User } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx
index 0cd54405e80..03a6a3e9570 100644
--- a/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx
+++ b/frontend/src/metabase/home/components/HomePage/HomePage.unit.spec.tsx
@@ -5,8 +5,8 @@ import {
setupRecentViewsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { DashboardId } from "metabase-types/api";
import { createMockDashboard, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx
index 7ee9f199cef..8128f682d97 100644
--- a/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx
+++ b/frontend/src/metabase/home/components/Onboarding/tests/setup.tsx
@@ -7,12 +7,9 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockAppState, createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { ChecklistItemValue } from "metabase/redux/store";
-import {
- createMockAppState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsx
index 34eeed86499..1003d603941 100644
--- a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.unit.spec.tsx
@@ -5,9 +5,9 @@ import { assocIn } from "icepick";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockCard } from "metabase-types/api/mocks";
import { createMockStructuredDatasetQuery } from "metabase-types/api/mocks/query";
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.unit.spec.tsx
index 7d393d8758d..98b7dac9443 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationNotice.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupUserMetabotPermissionsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { createMockUserMetabotPermissions } from "metabase-types/api/mocks/metabot";
diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx
index 89b4fe60705..7103bdb4d64 100644
--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.unit.spec.tsx
@@ -3,8 +3,8 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { UserMetabotPermissions } from "metabase-types/api";
import { createMockUserMetabotPermissions } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
index 4ce0f7cf50e..0022e991c60 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.unit.spec.tsx
@@ -3,8 +3,8 @@ import userEvent from "@testing-library/user-event";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
MetabotSuggestedTransform,
MetabotTransformInfo,
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChainOfThought/MetabotChainOfThought.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChainOfThought/MetabotChainOfThought.unit.spec.tsx
index b036ba67ebe..fee4b26a666 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChainOfThought/MetabotChainOfThought.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChainOfThought/MetabotChainOfThought.unit.spec.tsx
@@ -3,9 +3,9 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type { MetabotAgentChainOfThoughtMessage } from "metabase/metabot/state";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockDashboard } from "metabase-types/api/mocks";
import { MetabotChainOfThought } from "./MetabotChainOfThought";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx
index 3eee95c1718..548f0d84a6b 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx
@@ -10,9 +10,9 @@ import {
} from "__support__/server-mocks";
import { setupSearchEndpoints } from "__support__/server-mocks/search";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { createMockState } from "metabase/redux/store/mocks";
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
import {
createMockCard,
diff --git a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
index e351512fa0c..902a249caca 100644
--- a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
@@ -12,8 +12,8 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.unit.spec.tsx
index ddbabdb37c4..0f832f6c147 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.unit.spec.tsx
@@ -3,8 +3,8 @@ import type { ComponentProps } from "react";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupUserMetabotPermissionsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { MetabotInlineSQLPrompt } from "./MetabotInlineSQLPrompt";
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
index fa75882162c..a8faadf65ae 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
@@ -9,12 +9,12 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { MetabotProvider } from "metabase/metabot/context";
import { getMetadata } from "metabase/metadata-store";
import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor/NativeQueryEditor";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import {
diff --git a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx
index 844abeb02f1..0ebbe154b4d 100644
--- a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx
@@ -11,11 +11,11 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import type { MetabotPromptInputRef } from "metabase/metabot";
import { MetabotMentionPluginKey } from "metabase/metabot/components/editor-extensions/MetabotMention/MetabotMentionExtension";
-import { createMockState } from "metabase/redux/store/mocks";
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
import {
createMockCollection,
diff --git a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx
index 6ad9dbe6f87..28e381bea14 100644
--- a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { metabotReducer } from "metabase/metabot/state";
import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { Menu } from "metabase/ui";
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx
index 2a8412f2a3f..5d50e0d55c4 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.unit.spec.tsx
@@ -3,8 +3,8 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockTokenFeatures,
createMockUserMetabotPermissions,
diff --git a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
index 3d35d1f90eb..e3abb77035e 100644
--- a/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/hooks/use-user-metabot-permissions.unit.spec.tsx
@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { UserMetabotPermissionsResponse } from "metabase-types/api";
import {
createMockTokenFeatures,
diff --git a/frontend/src/metabase/metabot/state/selectors.unit.spec.ts b/frontend/src/metabase/metabot/state/selectors.unit.spec.ts
index 253603ae722..190060515a8 100644
--- a/frontend/src/metabase/metabot/state/selectors.unit.spec.ts
+++ b/frontend/src/metabase/metabot/state/selectors.unit.spec.ts
@@ -2,8 +2,8 @@ import { assocIn } from "icepick";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { createMockMetabotMessage } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { CONTEXT_WINDOW_WARNING_PERCENT } from "../constants";
diff --git a/frontend/src/metabase/metabot/tests/chat-message-rendering.unit.spec.tsx b/frontend/src/metabase/metabot/tests/chat-message-rendering.unit.spec.tsx
index 631b4fb1122..d614c2abe89 100644
--- a/frontend/src/metabase/metabot/tests/chat-message-rendering.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/chat-message-rendering.unit.spec.tsx
@@ -13,6 +13,7 @@ import {
setupDocumentEndpoints,
setupGetMetabotConversationEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
import { METABOT_ERR_MSG } from "metabase/metabot/constants";
import type {
@@ -32,7 +33,6 @@ import {
thumbsDown,
thumbsUp,
} from "metabase/metabot/tests/utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { registerVisualizations } from "metabase/visualizations/register";
import {
createMockCard,
diff --git a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
index 6fc89a36121..ef4ab4c7ce1 100644
--- a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
@@ -5,6 +5,7 @@ import { assocIn } from "icepick";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
import {
@@ -16,7 +17,6 @@ import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQL
import { useMetabotAgent } from "metabase/metabot/hooks";
import { getMetadata } from "metabase/metadata-store";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/metabot/tests/utils.tsx b/frontend/src/metabase/metabot/tests/utils.tsx
index ff93aee8c60..42a4689753b 100644
--- a/frontend/src/metabase/metabot/tests/utils.tsx
+++ b/frontend/src/metabase/metabot/tests/utils.tsx
@@ -9,6 +9,7 @@ import {
setupListMetabotConversationsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
type RenderWithProvidersOptions,
act,
@@ -27,7 +28,6 @@ import {
mockStreamedEndpoint,
} from "metabase/api/ai-streaming/test-utils";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type {
diff --git a/frontend/src/metabase/metadata-store/provider-hooks.unit.spec.tsx b/frontend/src/metabase/metadata-store/provider-hooks.unit.spec.tsx
index c6773c1da68..7e66ac50234 100644
--- a/frontend/src/metabase/metadata-store/provider-hooks.unit.spec.tsx
+++ b/frontend/src/metabase/metadata-store/provider-hooks.unit.spec.tsx
@@ -1,6 +1,6 @@
+import { createMockSettingsState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderHookWithProviders } from "__support__/ui";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/metadata-store/provider.unit.spec.ts b/frontend/src/metabase/metadata-store/provider.unit.spec.ts
index fdae7aae7d0..fa26d583ebe 100644
--- a/frontend/src/metabase/metadata-store/provider.unit.spec.ts
+++ b/frontend/src/metabase/metadata-store/provider.unit.spec.ts
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
import type { UnsavedCard } from "metabase-types/api";
diff --git a/frontend/src/metabase/metadata-store/selectors.unit.spec.ts b/frontend/src/metabase/metadata-store/selectors.unit.spec.ts
index 253ee81a8ae..ebf90a35f44 100644
--- a/frontend/src/metabase/metadata-store/selectors.unit.spec.ts
+++ b/frontend/src/metabase/metadata-store/selectors.unit.spec.ts
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import Metadata from "metabase-lib/v1/metadata/Metadata";
import {
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
index 745a3015d18..e6a00420d64 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.unit.spec.tsx
@@ -1,10 +1,10 @@
import { setupEnterprisePlugins } from "__support__/enterprise";
import { setupMetricEndpoint } from "__support__/server-mocks/metric";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { MetricUrls } from "metabase/common/metrics/types";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx
index 0ea9aedb32e..0e588ec10e9 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx
@@ -9,8 +9,8 @@ import { setupBookmarksEndpoints } from "__support__/server-mocks/bookmark";
import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { CollectionType } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
index 80e548f9cc0..25f69583c01 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.unit.spec.tsx
@@ -3,9 +3,9 @@ import { setupDatabaseEndpoints } from "__support__/server-mocks/database";
import { setupDependencyGraphEndpoint } from "__support__/server-mocks/dependencies";
import { setupTableEndpoints } from "__support__/server-mocks/table";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { MetricUrls } from "metabase/common/metrics/types";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
index 7fb1caef5cb..0f685cc3a88 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupMetricDatasetEndpoint,
setupMetricEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { registerVisualizations } from "metabase/visualizations/register";
import type { Card, Dataset, Field, Metric } from "metabase-types/api";
diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
index 0614bd8d251..240159b2b4c 100644
--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
@@ -10,6 +10,7 @@ import {
setupDatabasesEndpoints,
setupModelActionsEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
@@ -18,10 +19,6 @@ import {
within,
} from "__support__/ui";
import { modalRoute } from "metabase/common/components/ModalRoute";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route, redirect } from "metabase/router";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx
index c52b83abb81..5f817cc500b 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx
index d3cbb038161..fedaa1f7cdb 100644
--- a/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx
+++ b/frontend/src/metabase/monitor/components/MonitorLayout/MonitorLayout.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupUserKeyValueEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type { TokenFeatures } from "metabase-types/api";
diff --git a/frontend/src/metabase/monitor/route-guards.unit.spec.tsx b/frontend/src/metabase/monitor/route-guards.unit.spec.tsx
index b3b88d62057..e407f781f6d 100644
--- a/frontend/src/metabase/monitor/route-guards.unit.spec.tsx
+++ b/frontend/src/metabase/monitor/route-guards.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { parseSearchQuery } from "metabase/utils/browser";
import { createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx
index b9250c156ab..3ddc3aaca65 100644
--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx
+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { createMockLocation } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockLocation } from "metabase/redux/store/mocks";
import type { Location } from "metabase/router";
import { Route } from "metabase/router";
import { openSaveDialog } from "metabase/utils/dom";
diff --git a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
index da1ecb66096..8186e9fa642 100644
--- a/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
+++ b/frontend/src/metabase/monitor/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
@@ -6,6 +6,7 @@ import {
setupTasksEndpoints,
setupUniqueTasksEndpoint,
} from "__support__/server-mocks";
+import { createMockLocation } from "__support__/state";
import {
act,
mockGetBoundingClientRect,
@@ -16,7 +17,6 @@ import {
within,
} from "__support__/ui";
import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";
-import { createMockLocation } from "metabase/redux/store/mocks";
import type { Location } from "metabase/router";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx
index c1e83db5863..c3327ed9f45 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.unit.spec.tsx
@@ -1,7 +1,7 @@
import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import {
createMockSettings,
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
index 72a23ab524e..aa61f25ce1e 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";
import { setupBugReportingDetailsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { dayjs } from "metabase/dayjs";
import {
createMockAdminAppState,
createMockAdminState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
+import { dayjs } from "metabase/dayjs";
import { Route } from "metabase/router";
import type { HelpLinkSetting } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
index 862e4ba8d53..653adad1f96 100644
--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import * as iframeUtils from "metabase/utils/iframe";
import type { VersionInfo, VersionInfoRecord } from "metabase-types/api"; // Add VersionInfo
import {
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
index 66a714780cf..84826bd93eb 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
@@ -6,6 +6,7 @@ import {
setupSearchEndpoints,
setupUserRecipientsEndpoint,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
@@ -14,10 +15,6 @@ import {
within,
} from "__support__/ui";
import { SearchBar } from "metabase/nav/components/search/SearchBar";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { CollectionItem, RecentItem } from "metabase-types/api";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
index ac07ee04039..e1bbfbf32ab 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
@@ -12,10 +12,10 @@ import {
setupTokenStatusEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { createMockState } from "metabase/redux/store/mocks";
import type {
GdrivePayload,
ICloudAddOnProduct,
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts
index a25be32bee0..b5237b7c420 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts
@@ -1,8 +1,8 @@
import { setupDatabaseListEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
import { useAddDataState } from "./use-add-data-state";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.unit.spec.tsx
index 5cb86c66b46..01c8c54cef4 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.unit.spec.tsx
@@ -3,8 +3,8 @@ import { times } from "underscore";
import { setupEnterprisePlugins } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockBookmark,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
index 39550e5e7e8..3c31c145ac6 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
@@ -4,6 +4,8 @@ import {
setupDatabaseListEndpoint,
setupUpdateSettingEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
+import { createMockEmbeddingDataPickerState } from "__support__/state/embedding-data-picker";
import {
getIcon,
renderWithProviders,
@@ -12,8 +14,6 @@ import {
within,
} from "__support__/ui";
import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";
-import { createMockState } from "metabase/redux/store/mocks";
-import { createMockEmbeddingDataPickerState } from "metabase/redux/store/mocks/embedding-data-picker";
import * as iframeUtils from "metabase/utils/iframe";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.unit.spec.tsx
index 4e8963a20b4..31348df65f5 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { setupDatabaseListEndpoint } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
import { GettingStartedSection } from "./GettingStartedSection";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts
index ce24a9b56a7..9f86376b393 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts
@@ -4,9 +4,9 @@ import {
setupTokenStatusEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderHookWithProviders, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockDatabase,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx
index 84fafc9d9bd..18b346207a2 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarLibrarySection/tests/setup.tsx
@@ -5,9 +5,9 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Collection } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
index 9a0b58e85ed..db98983ddd4 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
@@ -12,6 +12,11 @@ import {
setupSettingEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import {
+ createMockDashboardState,
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import {
renderWithProviders,
screen,
@@ -20,11 +25,6 @@ import {
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { dayjs } from "metabase/dayjs";
import type { DashboardState, StoreDashboard } from "metabase/redux/store";
-import {
- createMockDashboardState,
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route, useLocation, useParams } from "metabase/router";
import * as iframeUtils from "metabase/utils/iframe";
import type {
diff --git a/frontend/src/metabase/new/components/NewModals/NewItemMenu.unit.spec.tsx b/frontend/src/metabase/new/components/NewModals/NewItemMenu.unit.spec.tsx
index 4842d29d0e0..bb3e022d8a6 100644
--- a/frontend/src/metabase/new/components/NewModals/NewItemMenu.unit.spec.tsx
+++ b/frontend/src/metabase/new/components/NewModals/NewItemMenu.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { NewItemMenu } from "metabase/nav/components/NewItemMenu";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { Database } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/notifications/HasResultsAlertPrompt/HasResultsAlertPrompt.unit.spec.tsx b/frontend/src/metabase/notifications/HasResultsAlertPrompt/HasResultsAlertPrompt.unit.spec.tsx
index ab6acd91b0e..01df2625004 100644
--- a/frontend/src/metabase/notifications/HasResultsAlertPrompt/HasResultsAlertPrompt.unit.spec.tsx
+++ b/frontend/src/metabase/notifications/HasResultsAlertPrompt/HasResultsAlertPrompt.unit.spec.tsx
@@ -6,10 +6,10 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Card } from "metabase-types/api";
import { createMockCard, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx
index 369b548400d..563af8b6b47 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.unit.spec.tsx
@@ -9,11 +9,11 @@ import {
} from "__support__/server-mocks";
import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
import { CreateOrEditQuestionAlertModal } from "metabase/notifications/modals";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type {
Notification,
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/setup.spec.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/setup.spec.tsx
index 8f0bab73d04..6161874cd50 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/setup.spec.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/setup.spec.tsx
@@ -1,7 +1,7 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { ScheduleValueType } from "metabase/common/components/Schedule/domain";
-import { createMockState } from "metabase/redux/store/mocks";
import type { NotificationCronSubscription } from "metabase-types/api";
import { NotificationSchedule } from "./NotificationSchedule";
diff --git a/frontend/src/metabase/palette/components/Palette.stories.tsx b/frontend/src/metabase/palette/components/Palette.stories.tsx
index 66d3894f6b4..2c4c79c1feb 100644
--- a/frontend/src/metabase/palette/components/Palette.stories.tsx
+++ b/frontend/src/metabase/palette/components/Palette.stories.tsx
@@ -8,10 +8,10 @@ import { HttpResponse, http } from "msw";
import { getCommonStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Box, Center } from "metabase/ui";
import { ComboChart } from "metabase/visualizations/visualizations/ComboChart";
import { LineChart } from "metabase/visualizations/visualizations/LineChart";
diff --git a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
index 9ff92efabc2..736802833f7 100644
--- a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
+++ b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupRecentViewsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { SearchResult } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
index 1d2699e0833..4b86fc4e6e5 100644
--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
@@ -10,14 +10,14 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
-import { renderWithProviders } from "__support__/ui";
-import { useCommandPalette } from "metabase/palette/hooks/useCommandPalette";
-import { useCommandPaletteBasicActions } from "metabase/palette/hooks/useCommandPaletteBasicActions";
import {
createMockAdminAppState,
createMockAdminState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders } from "__support__/ui";
+import { useCommandPalette } from "metabase/palette/hooks/useCommandPalette";
+import { useCommandPaletteBasicActions } from "metabase/palette/hooks/useCommandPaletteBasicActions";
import { Route, useLocation, useParams } from "metabase/router";
import { parseSearchQuery } from "metabase/utils/browser";
import type { RecentItem, Settings } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
index 622d617dcc6..0162ad051a8 100644
--- a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
@@ -1,9 +1,6 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { setLocalization } from "metabase/utils/i18n";
import { createMockParameter } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/tests/setup.tsx b/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/tests/setup.tsx
index 00375dafe67..6b78ba8220a 100644
--- a/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/tests/setup.tsx
+++ b/frontend/src/metabase/parameters/components/TagEditor/TagEditorHelp/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/parameters/components/TagEditor/TagEditorParam.unit.spec.tsx b/frontend/src/metabase/parameters/components/TagEditor/TagEditorParam.unit.spec.tsx
index 78cfb2aadfb..537097225c5 100644
--- a/frontend/src/metabase/parameters/components/TagEditor/TagEditorParam.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/TagEditor/TagEditorParam.unit.spec.tsx
@@ -6,13 +6,13 @@ import {
setupParameterValuesEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { getMetadata } from "metabase/metadata-store";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { getMetadata } from "metabase/metadata-store";
import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import { getTemplateTagParameter } from "metabase-lib/v1/parameters/utils/template-tags";
diff --git a/frontend/src/metabase/parameters/components/TagEditor/TagEditorSidebar.unit.spec.tsx b/frontend/src/metabase/parameters/components/TagEditor/TagEditorSidebar.unit.spec.tsx
index 7622ca4905b..a203a2f8083 100644
--- a/frontend/src/metabase/parameters/components/TagEditor/TagEditorSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/TagEditor/TagEditorSidebar.unit.spec.tsx
@@ -3,10 +3,10 @@ import {
setupParameterValuesEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type { TemplateTag } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/TemplateTagsSidebar.unit.spec.tsx b/frontend/src/metabase/parameters/components/TemplateTagsSidebar.unit.spec.tsx
index 51b4d6fe957..c397a9e6515 100644
--- a/frontend/src/metabase/parameters/components/TemplateTagsSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/TemplateTagsSidebar.unit.spec.tsx
@@ -5,10 +5,10 @@ import {
setupParameterValuesEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import {
createMockCard,
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
index ad2e667eae3..199428ccc57 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
@@ -17,6 +17,7 @@ import {
setupUnauthorizedCollectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
renderWithProviders,
@@ -24,7 +25,6 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
index a210ed7f48f..fc26a91ee57 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx
@@ -14,10 +14,10 @@ import {
setupUnauthorizedCollectionsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type { Card, ParameterValues, TokenFeatures } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts
index 33baed9f573..1409ae4a0a3 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/testMocks.spec.ts
@@ -1,6 +1,6 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockField,
createMockFieldDimension,
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx
index 4048f654960..0a34605a3a1 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/ParameterFieldWidget.unit.spec.tsx
@@ -4,10 +4,10 @@ import {
setupParameterSearchValuesEndpoint,
setupParameterValuesEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import type Field from "metabase-lib/v1/metadata/Field";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx
index fb4cc98be7f..db73b40a292 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx
@@ -5,8 +5,8 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupDatabasesEndpoints } from "__support__/server-mocks";
import { setupEmbedDashboardEndpoints } from "__support__/server-mocks/embed";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { registerStaticVisualizations } from "metabase/static-viz/register";
import type {
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx
index 0bd2f1203b7..10e3654efd1 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx
@@ -4,6 +4,11 @@ import { HttpResponse, http } from "msw";
import _ from "underscore";
import { getPublicStore } from "__support__/entities-store";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+} from "__support__/state";
import { getNextId } from "__support__/utils";
import { NumberColumn, StringColumn } from "__support__/visualizations";
import {
@@ -12,11 +17,6 @@ import {
} from "metabase/dashboard/context/mock-context";
import { Heading } from "metabase/dashboard/visualizations/Heading";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { registerVisualization } from "metabase/viz-core";
import type { Dashboard } from "metabase-types/api";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
index a122176496b..a725bc7df64 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
@@ -4,6 +4,11 @@ import { HttpResponse, http } from "msw";
import _ from "underscore";
import { getPublicStore } from "__support__/entities-store";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { createWaitForResizeToStopDecorator } from "__support__/storybook";
import { getNextId } from "__support__/utils";
@@ -14,11 +19,6 @@ import {
type MockDashboardContextProps,
} from "metabase/dashboard/context/mock-context";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { stableStringify } from "metabase/utils/objects";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx
index 2f94f0e3849..023487d0580 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx
@@ -5,6 +5,11 @@ import { userEvent, within } from "@storybook/test";
import { HttpResponse, http } from "msw";
import { getPublicStore } from "__support__/entities-store";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+} from "__support__/state";
import { createWaitForResizeToStopDecorator } from "__support__/storybook";
import { getNextId } from "__support__/utils";
import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";
@@ -14,11 +19,6 @@ import {
} from "metabase/dashboard/context/mock-context";
import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import MetabaseSettings from "metabase/utils/settings";
import { Map } from "metabase/visualizations/visualizations/Map";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
index e688065b067..a7a838712e6 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
@@ -6,6 +6,11 @@ import { useEffect, useMemo } from "react";
import _ from "underscore";
import { getPublicStore } from "__support__/entities-store";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+} from "__support__/state";
import { createWaitForResizeToStopDecorator } from "__support__/storybook";
import { getNextId } from "__support__/utils";
import { NumberColumn, StringColumn } from "__support__/visualizations";
@@ -15,11 +20,6 @@ import {
type MockDashboardContextProps,
} from "metabase/dashboard/context/mock-context";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box, Card, Popover, Text, Tooltip } from "metabase/ui";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { ObjectDetail } from "metabase/visualizations/visualizations/ObjectDetail";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx
index d06ae28314e..898c26e8c81 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx
@@ -7,12 +7,12 @@ import {
setupPublicQuestionEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { registerStaticVisualizations } from "metabase/static-viz/register";
import type { VisualizationProps } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
index b0bc760f3aa..7edb51e9f20 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
@@ -7,6 +7,7 @@ import type { ComponentProps } from "react";
import { getPublicStore } from "__support__/entities-store";
import { createMockMetadata } from "__support__/metadata";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { createWaitForResizeToStopDecorator } from "__support__/storybook";
import { getNextId } from "__support__/utils";
import {
@@ -15,10 +16,6 @@ import {
StringColumn,
} from "__support__/visualizations";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { PivotTable } from "metabase/visualizations/visualizations/PivotTable";
diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx
index 588eebfd503..8a0799b9736 100644
--- a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx
+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx
@@ -2,9 +2,9 @@ import { renderHook } from "@testing-library/react";
import type { PropsWithChildren } from "react";
import { mainReducers } from "__support__/entities-store";
+import { createMockState } from "__support__/state";
import { MetabaseReduxProvider } from "metabase/redux";
import type { EmbedState } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Location } from "metabase/router";
import { getStore } from "metabase/store";
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
index 775ba35a16e..88ef5954168 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
@@ -1,5 +1,6 @@
import fetchMock from "fetch-mock";
+import { createMockLocation, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { databaseApi, snippetApi } from "metabase/api";
import * as rtkEndpointUtils from "metabase/api/utils/run-rtk-endpoint";
@@ -8,10 +9,6 @@ import { getMetadata } from "metabase/metadata-store";
import * as questionActions from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
import * as sharedQB from "metabase/redux/query-builder";
-import {
- createMockLocation,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Location } from "metabase/router";
import * as Urls from "metabase/urls";
import { defer } from "metabase/utils/promise";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index 48916eb6817..c7fc9893fc2 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -1,12 +1,12 @@
-import { createMockEntitiesState } from "__support__/store";
-import { getMetadata } from "metabase/metadata-store";
-import * as questionActions from "metabase/questions/actions";
-import type { QueryBuilderMode } from "metabase/redux/store";
import {
createMockQueryBuilderState,
createMockQueryBuilderUIControlsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { getMetadata } from "metabase/metadata-store";
+import * as questionActions from "metabase/questions/actions";
+import type { QueryBuilderMode } from "metabase/redux/store";
import { checkNotNull } from "metabase/utils/types";
import { registerVisualizations } from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts b/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
index 1f18e00159c..298b7008006 100644
--- a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
@@ -5,13 +5,13 @@
// on it. Complementary to router/navigate-contract.unit.spec.tsx, which pins the
// other side: how `navigate` drives the router.
-import { createMockEntitiesState } from "__support__/store";
-import { getMetadata } from "metabase/metadata-store";
import {
createMockQueryBuilderState,
createMockQueryBuilderUIControlsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { getMetadata } from "metabase/metadata-store";
import {
type NavigateOptions,
type To,
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
index c0554e08265..2bca93a95fd 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
@@ -6,6 +6,7 @@ import {
setupNativeQuerySnippetEndpoints,
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
renderWithProviders,
@@ -14,7 +15,6 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/tests/setup.tsx b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/tests/setup.tsx
index 14ecfb03009..b65d3d71ce7 100644
--- a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx b/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
index b90d5718458..a1597bac791 100644
--- a/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
@@ -6,6 +6,10 @@ import {
setupDatabasesEndpoints,
setupTableEndpoints,
} from "__support__/server-mocks";
+import {
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { testDataset } from "__support__/testDataset";
import {
@@ -15,10 +19,6 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import {
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { registerVisualizations } from "metabase/visualizations/register";
import type { Field } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
index 38288859ff7..bd1a0316622 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
@@ -4,10 +4,10 @@ import {
setupCardQueryDownloadEndpoint,
setupLastDownloadFormatEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
index 51d4ba410ce..685aaf1dcaf 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
@@ -6,11 +6,11 @@ import {
setupLastDownloadFormatEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { registerVisualizations } from "metabase/visualizations/register";
import type { Card, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.unit.spec.tsx b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.unit.spec.tsx
index 84501af1f69..af20a58a889 100644
--- a/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/SavedQuestionHeaderButton/SavedQuestionHeaderButton.unit.spec.tsx
@@ -4,8 +4,8 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
import { createMockMetadata } from "__support__/metadata";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, getIcon, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/tests/setup.tsx
index 0a1efad3706..8371e3660cd 100644
--- a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/tests/setup.tsx
@@ -2,12 +2,12 @@ import fetchMock from "fetch-mock";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders } from "__support__/ui";
import type { TokenFeatures } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
index f6f6302a6fb..0c130806177 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
@@ -5,6 +5,7 @@ import {
setupDatabasesEndpoints,
setupUnauthorizedDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockQueryBuilderState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
fireEvent,
@@ -12,7 +13,6 @@ import {
screen,
waitFor,
} from "__support__/ui";
-import { createMockQueryBuilderState } from "metabase/redux/store/mocks";
import { formatNumber } from "metabase/utils/formatting";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.unit.spec.tsx
index f6100779dbd..cea1b8c481b 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.unit.spec.tsx
@@ -1,12 +1,12 @@
import userEvent from "@testing-library/user-event";
import { setupCardDashboardsEndpoint } from "__support__/server-mocks/card";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
import { createMockCard } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/test-utils.ts b/frontend/src/metabase/query_builder/components/view/ViewFooter/test-utils.ts
index 49b0b1cad65..381e7148035 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/test-utils.ts
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/test-utils.ts
@@ -1,10 +1,10 @@
import { mockSettings } from "__support__/settings";
-import { createMockEntitiesState } from "__support__/store";
import {
createMockQueryBuilderState,
createMockQueryBuilderUIControlsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
import type { Card, Dataset } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
index a70c3463fd7..2c8484a73bb 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.tsx
@@ -8,10 +8,10 @@ import {
setupTableEndpoints,
} from "__support__/server-mocks";
import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-value";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import MetabaseSettings from "metabase/utils/settings";
import { checkNotNull } from "metabase/utils/types";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx
index a5f1ba7ba4e..76026febc1c 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx
@@ -4,6 +4,10 @@ import fetchMock from "fetch-mock";
import { setupCardsForTableEndpoint } from "__support__/server-mocks";
import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";
import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-value";
+import {
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
getIcon,
@@ -15,10 +19,6 @@ import {
} from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
import { MODAL_TYPES } from "metabase/querying/constants";
-import {
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/setup.tsx
index cb1870c89ea..ddec65d46a6 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/tests/setup.tsx
@@ -7,9 +7,9 @@ import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks";
import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { QuestionAlertListModal } from "metabase/notifications/modals";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import type {
Card,
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx
index c56efe00935..528e92e9081 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/ViewOnly.unit.spec.tsx
@@ -1,9 +1,9 @@
import userEvent from "@testing-library/user-event";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import * as Lib from "metabase-lib";
import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsx
index 2dd6112971f..ae30b89a800 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/tests/setup.tsx
@@ -9,9 +9,9 @@ import {
import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { useSelector } from "metabase/redux";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type { Card, Notification, User } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
index aa4dfc0b1fc..bcbc4bb6dd5 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
@@ -1,10 +1,10 @@
import { createMockMetadata } from "__support__/metadata";
-import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockQueryBuilderUIControlsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import { checkNotNull } from "metabase/utils/types";
import { registerVisualizations } from "metabase/visualizations/register";
import { createMockColumn, createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
index c895ffef1e5..1fb5335e121 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionPublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
@@ -4,10 +4,10 @@ import { useState } from "react";
import { setupCardPublicLinkEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import { createMockCard, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
index f21c87995cc..54e164fec7b 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
@@ -8,15 +8,12 @@ import {
setupCollectionsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
index 0dc650fb047..ea4f00567aa 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
@@ -2,13 +2,13 @@ import _ from "underscore";
import { setupListDatabaseSchemasEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen, within } from "__support__/ui";
-import { modelIconMap } from "metabase/common/utils/icon";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen, within } from "__support__/ui";
+import { modelIconMap } from "metabase/common/utils/icon";
import { Route } from "metabase/router";
import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
index f3ee1463e13..f77af878796 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
@@ -10,12 +10,12 @@ import {
} from "__support__/server-mocks";
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { mockSettings } from "__support__/settings";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Settings, User } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
index 4f46c832a21..e2726db2233 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
@@ -6,10 +6,10 @@ import {
import { setupPerformanceEndpoints } from "__support__/server-mocks/performance";
import { setupModelPersistenceEndpoints } from "__support__/server-mocks/persist";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Settings } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.unit.spec.tsx
index a5b266d3433..a9810b6e2a7 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.unit.spec.tsx
@@ -2,11 +2,11 @@ import userEvent from "@testing-library/user-event";
import { useState } from "react";
import { setupDatabaseEndpoints } from "__support__/server-mocks";
-import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import * as Lib from "metabase-lib";
import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import { createMockCard } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsx
index 2bc7f2730bd..1ce3d37fa01 100644
--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx
+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx
@@ -25,6 +25,7 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
@@ -35,7 +36,6 @@ import {
import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";
import { serializeCardForUrl } from "metabase/common/utils/card";
import { NewItemMenu } from "metabase/nav/components/NewItemMenu";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset, Timeline, UnsavedCard } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/store/selectors.unit.spec.ts b/frontend/src/metabase/query_builder/store/selectors.unit.spec.ts
index 0392224c02c..66c5e01c583 100644
--- a/frontend/src/metabase/query_builder/store/selectors.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/store/selectors.unit.spec.ts
@@ -1,16 +1,16 @@
import { assoc } from "icepick";
+import {
+ createMockQueryBuilderState,
+ createMockQueryBuilderUIControlsState,
+ createMockState,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import type {
QueryBuilderState,
QueryBuilderUIControls,
Range,
} from "metabase/redux/store";
-import {
- createMockQueryBuilderState,
- createMockQueryBuilderUIControlsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { registerVisualizations } from "metabase/visualizations/register";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts b/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
index da59ae727c1..e4f054a2488 100644
--- a/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
@@ -1,7 +1,7 @@
import { createMockMetadata } from "__support__/metadata";
+import { createMockLocation } from "__support__/state";
import { getNextId } from "__support__/utils";
import { serializeCardForUrl } from "metabase/common/utils/card";
-import { createMockLocation } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/action-creator/tests/common.tsx b/frontend/src/metabase/querying/action-creator/tests/common.tsx
index a293f1a6e38..a9e6f5a7e04 100644
--- a/frontend/src/metabase/querying/action-creator/tests/common.tsx
+++ b/frontend/src/metabase/querying/action-creator/tests/common.tsx
@@ -5,15 +5,12 @@ import {
setupCardsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
renderWithProviders,
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Card, WritebackAction } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
index 44bec76a9a7..1c98191dae4 100644
--- a/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
@@ -3,13 +3,13 @@ import _ from "underscore";
import { createMockMetadata } from "__support__/metadata";
import { setupDatabaseEndpoints } from "__support__/server-mocks";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type { State } from "metabase/redux/store";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import type { State } from "metabase/redux/store";
import * as Lib from "metabase-lib";
import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.tsx
index 7af5c47364b..a1ac0b32fc5 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.tsx
@@ -2,13 +2,10 @@ import userEvent from "@testing-library/user-event";
import type { ComponentProps } from "react";
import { createMockMetadata } from "__support__/metadata";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { getIcon, render, renderWithProviders, screen } from "__support__/ui";
import { delay } from "__support__/utils";
import { UnconnectedDataSelector as DataSelector } from "metabase/querying/common/components/DataSelector";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";
import {
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
index 419e87a22bc..8666256c5ac 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
@@ -1,9 +1,9 @@
import userEvent from "@testing-library/user-event";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
index 3c6da2f6e59..c1ab94ed8c7 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { render, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
index 248b8a31dc5..68b8a55866d 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type Field from "metabase-lib/v1/metadata/Field";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
index 00d2b9af88d..42923820757 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
index 038856dfc14..768baf00b1a 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
@@ -6,10 +6,10 @@ import { type ComponentProps, useEffect } from "react";
import { getPublicStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { Box, Popover } from "metabase/ui";
import { DatePicker } from "./DatePicker";
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx
index 3421f7c143c..e8d895ab7ce 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx
@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";
import type { ReactNode } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import {
DATE_PICKER_EXTRACTION_UNITS,
@@ -12,7 +13,6 @@ import type {
DatePickerOperator,
ExcludeDatePickerValue,
} from "metabase/querying/common/types";
-import { createMockState } from "metabase/redux/store/mocks";
import type { DatePickerSubmitButtonProps } from "../types";
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
index a4ee3e31dd6..75c1302ec42 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
@@ -6,9 +6,9 @@ import { EditorState } from "@codemirror/state";
import fetchMock from "fetch-mock";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, renderWithProviders, waitFor } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { isNotNull } from "metabase/utils/types";
import type {
AutocompleteMatchStyle,
diff --git a/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
index f524363b18b..28e534f7560 100644
--- a/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsx
@@ -1,6 +1,6 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import {
PRODUCTS_ID,
diff --git a/frontend/src/metabase/querying/components/DataReference/MainPane.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/MainPane.unit.spec.tsx
index 13a45d4035d..639eb3ddb72 100644
--- a/frontend/src/metabase/querying/components/DataReference/MainPane.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/MainPane.unit.spec.tsx
@@ -6,9 +6,9 @@ import {
setupLibraryEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen } from "__support__/ui";
import { reinitialize } from "metabase/plugins";
-import { createMockState } from "metabase/redux/store/mocks/state";
import {
createMockDatabase,
createMockTokenFeatures,
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
index 1cdaf59d6a3..ac99912b386 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
@@ -2,9 +2,9 @@ import {
setupCollectionsEndpoints,
setupNativeQuerySnippetEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import { useNotebookScreenSize } from "metabase/querying/components/NativeQueryEditor/use-notebook-screen-size";
-import { createMockState } from "metabase/redux/store/mocks";
import { NativeQueryEditor } from "./NativeQueryEditor";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsx
index a84b5e7583e..a11b15e1077 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { AdminEmail } from "./AdminEmail";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
index 72c6d793a49..4a5fab7169a 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
@@ -2,9 +2,9 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { createMockMetadata } from "__support__/metadata";
import { setupUserMetabotPermissionsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type {
Card,
diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsx
index 3a277234484..b3d19e01c7a 100644
--- a/frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsx
@@ -7,8 +7,8 @@ import {
setupNativeQuerySnippetEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures, User } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
index ec9f73cad55..a3c07c7a0a0 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
@@ -1,9 +1,9 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { createMockMetadata } from "__support__/metadata";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { getHelpText } from "metabase/querying/expressions";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
index 1203d596055..39ec27a7a02 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
@@ -5,6 +5,7 @@ import {
setupFieldSearchValuesEndpoint,
setupFieldsValuesEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
renderWithProviders,
@@ -13,7 +14,6 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type { Database } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
index e71459df95f..d90527edd26 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
@@ -1,9 +1,9 @@
/* istanbul ignore file */
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { dayjs } from "metabase/dayjs";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/tests/setup.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/tests/setup.tsx
index fd5aa91e039..ce94134ac4b 100644
--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.unit.spec.tsx
index 3abb9171b59..2960f8c1c5f 100644
--- a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.unit.spec.tsx
@@ -1,16 +1,16 @@
import userEvent from "@testing-library/user-event";
import { setupDatabaseEndpoints } from "__support__/server-mocks";
+import {
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import {
getIcon,
queryIcon,
renderWithProviders,
screen,
} from "__support__/ui";
-import {
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import * as Lib from "metabase-lib";
import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import { createMockCard } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
index 3ace92b1193..c9d1d2999ee 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
@@ -9,6 +9,7 @@ import {
setupRecentViewsAndSelectionsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
fireEvent,
@@ -19,7 +20,6 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { METAKEY } from "metabase/utils/browser";
import * as Lib from "metabase-lib";
import { createMetadataProvider } from "metabase-lib/test-helpers";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
index dd23c801425..567b3164d4f 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/tests/setup.tsx
@@ -3,10 +3,10 @@ import {
setupEmbeddingDataPickerDecisionEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
+import { createMockEmbeddingDataPickerState } from "__support__/state/embedding-data-picker";
import { renderWithProviders } from "__support__/ui";
import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";
-import { createMockState } from "metabase/redux/store/mocks";
-import { createMockEmbeddingDataPickerState } from "metabase/redux/store/mocks/embedding-data-picker";
import type { Query } from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import { createMockModelResult } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStepList/NotebookStepList.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStepList/NotebookStepList.unit.spec.tsx
index 88934ed1ec1..7dcd9dd55c9 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookStepList/NotebookStepList.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookStepList/NotebookStepList.unit.spec.tsx
@@ -1,12 +1,12 @@
import type { ComponentProps } from "react";
import { createMockMetadata } from "__support__/metadata";
-import { createMockEntitiesState } from "__support__/store";
-import { renderWithProviders, screen } from "__support__/ui";
import {
createMockQueryBuilderState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { createMockEntitiesState } from "__support__/store";
+import { renderWithProviders, screen } from "__support__/ui";
import * as Lib from "metabase-lib";
import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/run-query.unit.spec.ts b/frontend/src/metabase/querying/run-query.unit.spec.ts
index 1cef9a62eab..b936e45fe78 100644
--- a/frontend/src/metabase/querying/run-query.unit.spec.ts
+++ b/frontend/src/metabase/querying/run-query.unit.spec.ts
@@ -1,10 +1,10 @@
import fetchMock from "fetch-mock";
import { getMainStore } from "__support__/entities-store";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { waitFor } from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import { createMockState } from "metabase/redux/store/mocks";
import Question from "metabase-lib/v1/Question";
import type {
Card,
diff --git a/frontend/src/metabase/redux/hooks.unit.spec.tsx b/frontend/src/metabase/redux/hooks.unit.spec.tsx
index 5ab125f77c4..7b632314617 100644
--- a/frontend/src/metabase/redux/hooks.unit.spec.tsx
+++ b/frontend/src/metabase/redux/hooks.unit.spec.tsx
@@ -1,6 +1,6 @@
+import { createMockAppState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type { State } from "metabase/redux/store";
-import { createMockAppState } from "metabase/redux/store/mocks";
import { useDispatch, useSelector } from "./hooks";
diff --git a/frontend/src/metabase/redux/uploads.unit.spec.ts b/frontend/src/metabase/redux/uploads.unit.spec.ts
index da953f72e93..22b003dea1a 100644
--- a/frontend/src/metabase/redux/uploads.unit.spec.ts
+++ b/frontend/src/metabase/redux/uploads.unit.spec.ts
@@ -1,7 +1,7 @@
import fetchMock from "fetch-mock";
import { getMainStore } from "__support__/entities-store";
-import { createMockState } from "metabase/redux/store/mocks";
+import { createMockState } from "__support__/state";
import { UploadMode } from "metabase/redux/store/upload";
import {
diff --git a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx
index a4126b5fde4..fcab60e6b37 100644
--- a/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx
+++ b/frontend/src/metabase/reference/databases/TableList.unit.spec.tsx
@@ -1,7 +1,7 @@
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, within } from "__support__/ui";
import { getNextId } from "__support__/utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/reference/segments/SegmentList/tests/setup.tsx b/frontend/src/metabase/reference/segments/SegmentList/tests/setup.tsx
index 5b753b799dc..8d79726e70f 100644
--- a/frontend/src/metabase/reference/segments/SegmentList/tests/setup.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentList/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { TokenFeatures, User } from "metabase-types/api";
import {
createMockTokenFeatures,
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
index 7f8ed8c2e2f..0be11373ec1 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
@@ -10,8 +10,8 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Input } from "metabase/ui";
import { type RecentItem, isRecentTableItem } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
index ea4b84ea811..3b65eeadbee 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
setupRecentViewsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import {
createMockRecentCollectionItem,
diff --git a/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx b/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
index 22daf81f608..2c06410687b 100644
--- a/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
+++ b/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
@@ -1,12 +1,12 @@
import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import type { AdminPath } from "metabase/redux/store";
import {
createMockAdminAppState,
createMockAdminState,
createMockSettingsState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import type { AdminPath } from "metabase/redux/store";
import { Route } from "metabase/router";
import { setBasename } from "metabase/utils/basename";
import { replaceLocation } from "metabase/utils/dom";
diff --git a/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx b/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx
index 93d772267e4..d0214a742a6 100644
--- a/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/search/components/SearchSidebar/tests/setup.tsx
@@ -1,9 +1,9 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupDatabasesEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
import type { URLSearchFilterQueryParams } from "metabase/common/search/types";
-import { createMockState } from "metabase/redux/store/mocks";
import { SearchSidebar } from "metabase/search/components/SearchSidebar";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/selectors/selectors.unit.spec.ts b/frontend/src/metabase/selectors/selectors.unit.spec.ts
index 0fb0153580f..caab4f9583f 100644
--- a/frontend/src/metabase/selectors/selectors.unit.spec.ts
+++ b/frontend/src/metabase/selectors/selectors.unit.spec.ts
@@ -1,7 +1,4 @@
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
createMockTokenFeatures,
createMockTokenStatus,
diff --git a/frontend/src/metabase/selectors/store-users.unit.spec.ts b/frontend/src/metabase/selectors/store-users.unit.spec.ts
index c3c5ea39a36..dbe7b8f3f03 100644
--- a/frontend/src/metabase/selectors/store-users.unit.spec.ts
+++ b/frontend/src/metabase/selectors/store-users.unit.spec.ts
@@ -2,10 +2,7 @@ import {
setupCurrentUserEndpoint,
setupPropertiesEndpoints,
} from "__support__/server-mocks";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { getStoreUsers } from "metabase/selectors/store-users";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/selectors/whitelabel/tests/setup.tsx b/frontend/src/metabase/selectors/whitelabel/tests/setup.tsx
index 7eae0968806..2405efb5720 100644
--- a/frontend/src/metabase/selectors/whitelabel/tests/setup.tsx
+++ b/frontend/src/metabase/selectors/whitelabel/tests/setup.tsx
@@ -2,8 +2,8 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { LoadingMessage, TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/settings/settings-cache.unit.spec.tsx b/frontend/src/metabase/settings/settings-cache.unit.spec.tsx
index 5f3d396a5b1..a2520e3403b 100644
--- a/frontend/src/metabase/settings/settings-cache.unit.spec.tsx
+++ b/frontend/src/metabase/settings/settings-cache.unit.spec.tsx
@@ -2,10 +2,10 @@ import userEvent from "@testing-library/user-event";
import { useState } from "react";
import { setupPropertiesEndpoints } from "__support__/server-mocks";
+import { createMockSettingsState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { useDispatch, useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockSettingsState } from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.unit.spec.tsx b/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.unit.spec.tsx
index d585974d761..9729eefb21e 100644
--- a/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/AIConfigStep/AIConfigStep.unit.spec.tsx
@@ -11,13 +11,10 @@ import {
setupPropertiesEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockSetupState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { reinitialize } from "metabase/plugins";
import type { SetupStep } from "metabase/redux/store";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
EnterpriseSettings,
LlmProviderConnection,
diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx
index 456d22de375..74373efae78 100644
--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx
@@ -1,10 +1,7 @@
import { mockSettings } from "__support__/settings";
+import { createMockSetupState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type { SetupState, SetupStep } from "metabase/redux/store";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx
index c00172fb22f..3b837c02c64 100644
--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx
@@ -5,12 +5,9 @@ import {
setupPropertiesEndpoints,
setupSettingsEndpoints,
} from "__support__/server-mocks";
+import { createMockSetupState, createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import type { SetupStep } from "metabase/redux/store";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { createMockSettings } from "metabase-types/api/mocks";
import { DataUsageStep } from "./DataUsageStep";
diff --git a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx
index 90a5562b995..a02687e9fda 100644
--- a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx
@@ -1,13 +1,13 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
-import { renderWithProviders, screen, within } from "__support__/ui";
-import type { SetupStep } from "metabase/redux/store";
import {
createMockSettingsState,
createMockSetupState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen, within } from "__support__/ui";
+import type { SetupStep } from "metabase/redux/store";
import type { DatabaseData } from "metabase-types/api";
import { createMockDatabaseData } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx
index 54f1408045e..1cbd7b0906c 100644
--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx
@@ -1,13 +1,13 @@
import userEvent from "@testing-library/user-event";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { Locale, SetupStep } from "metabase/redux/store";
import {
createMockLocale,
createMockSettingsState,
createMockSetupState,
createMockState,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen } from "__support__/ui";
+import type { Locale, SetupStep } from "metabase/redux/store";
import { LanguageStep } from "./LanguageStep";
diff --git a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx
index 820f4840172..983e061962d 100644
--- a/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/RedirectIfSetup/RedirectIfSetup.unit.spec.tsx
@@ -1,9 +1,6 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
import type { DispatchFn } from "metabase/redux/hooks";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import { getSetting, settingsApi } from "metabase/settings";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx
index eac69e108e7..df97eddfb58 100644
--- a/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx
@@ -1,11 +1,11 @@
import { mockSettings } from "__support__/settings";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { SetupStep, UserInfo } from "metabase/redux/store";
import {
createMockSetupState,
createMockState,
createMockUserInfo,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen } from "__support__/ui";
+import type { SetupStep, UserInfo } from "metabase/redux/store";
import { UserStep } from "./UserStep";
diff --git a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.unit.spec.tsx b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.unit.spec.tsx
index fbc18dfb7de..fa2dfabfea9 100644
--- a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.unit.spec.tsx
@@ -1,8 +1,5 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { WelcomePage } from "./WelcomePage";
diff --git a/frontend/src/metabase/setup/selectors.unit.spec.ts b/frontend/src/metabase/setup/selectors.unit.spec.ts
index 126767c9a8f..3197db7a4f1 100644
--- a/frontend/src/metabase/setup/selectors.unit.spec.ts
+++ b/frontend/src/metabase/setup/selectors.unit.spec.ts
@@ -1,9 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockSetupState, createMockState } from "__support__/state";
import type { SetupState } from "metabase/redux/store";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { EnterpriseSettings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/setup/tests/setup.tsx b/frontend/src/metabase/setup/tests/setup.tsx
index 0f69986a9b1..4381cc742ea 100644
--- a/frontend/src/metabase/setup/tests/setup.tsx
+++ b/frontend/src/metabase/setup/tests/setup.tsx
@@ -15,12 +15,9 @@ import {
setupSettingsEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockSetupState, createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import type { SetupStep } from "metabase/redux/store";
-import {
- createMockSetupState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type {
EnterpriseSettings,
TokenFeatures,
diff --git a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.unit.spec.tsx b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.unit.spec.tsx
index 79b4984031d..48a2d542cef 100644
--- a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.unit.spec.tsx
@@ -1,8 +1,8 @@
import userEvent from "@testing-library/user-event";
import { setupDatabasesEndpoints } from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Database, User } from "metabase-types/api";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
index de041e5e568..74bfe4c473a 100644
--- a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
@@ -1,10 +1,10 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { createMockState } from "__support__/state";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
import { downloadDataset } from "metabase/redux/downloads";
import type { Dispatch, DownloadsState } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { HIDE_DELAY } from "metabase/status/hooks/use-status-visibility";
import Question from "metabase-lib/v1/Question";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
index 8253b9d72cc..88908f8ee09 100644
--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx
@@ -2,8 +2,8 @@ import {
setupCollectionByIdEndpoint,
setupCollectionsEndpoints,
} from "__support__/server-mocks";
+import { createMockState, createMockUpload } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState, createMockUpload } from "metabase/redux/store/mocks";
import { createMockCollection } from "metabase-types/api/mocks";
import { FileUploadStatus } from "./FileUploadStatus";
diff --git a/frontend/src/metabase/status/components/StatusListing/StatusListing.unit.spec.tsx b/frontend/src/metabase/status/components/StatusListing/StatusListing.unit.spec.tsx
index aeaec8f7013..3c8095db65f 100644
--- a/frontend/src/metabase/status/components/StatusListing/StatusListing.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/StatusListing/StatusListing.unit.spec.tsx
@@ -3,13 +3,13 @@ import {
setupCollectionsEndpoints,
setupDatabasesEndpoints,
} from "__support__/server-mocks";
-import { renderWithProviders, screen } from "__support__/ui";
-import type { DownloadsState } from "metabase/redux/store";
import {
createMockDownload,
createMockState,
createMockUpload,
-} from "metabase/redux/store/mocks";
+} from "__support__/state";
+import { renderWithProviders, screen } from "__support__/ui";
+import type { DownloadsState } from "metabase/redux/store";
import type { FileUploadState } from "metabase/redux/store/upload";
import type { Database } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.unit.spec.tsx b/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.unit.spec.tsx
index 8fa14c86760..ddaee6d778e 100644
--- a/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/components/LockedTransformsBanner/LockedTransformsBanner.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { LockedTransformsBanner } from "./LockedTransformsBanner";
diff --git a/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.unit.spec.tsx b/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.unit.spec.tsx
index 8f30cf79e3f..319e39f38c5 100644
--- a/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/components/LockedTransformsHoverCard/LockedTransformsHoverCard.unit.spec.tsx
@@ -1,6 +1,6 @@
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { createMockUser } from "metabase-types/api/mocks";
import { LockedTransformsHoverCard } from "./LockedTransformsHoverCard";
diff --git a/frontend/src/metabase/transforms/components/RunButton/RunButton.unit.spec.tsx b/frontend/src/metabase/transforms/components/RunButton/RunButton.unit.spec.tsx
index 2549973b128..d8c40520260 100644
--- a/frontend/src/metabase/transforms/components/RunButton/RunButton.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/components/RunButton/RunButton.unit.spec.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { act, fireEvent, renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Menu } from "metabase/ui";
import type { TransformRun } from "metabase-types/api";
import { createMockTransformRun } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
index 2526bb94db1..59cee89f8e3 100644
--- a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.unit.spec.tsx
@@ -4,12 +4,12 @@ import {
setupTransformRevisionsEndpoint,
setupUsersEndpoints,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import type { Revision, Transform } from "metabase-types/api";
import {
createMockRevision,
diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx
index 2c132c7a135..76b5d71098a 100644
--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.unit.spec.tsx
@@ -4,8 +4,8 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx
index 60e41178e09..0d3e53807c7 100644
--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
setupUpdateTransformJobEndpoint,
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
+import { createMockState } from "__support__/state/state";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks/state";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type { TransformJob } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
index 5e6736ff20e..9219f95c933 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.unit.spec.tsx
@@ -8,13 +8,13 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
mockGetBoundingClientRect,
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import * as Urls from "metabase/urls";
import type {
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
index 3f8f74d0bc2..b8d4be7f16c 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.unit.spec.tsx
@@ -7,12 +7,12 @@ import {
setupUserMetabotPermissionsEndpoint,
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import {
renderWithProviders,
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
index e0796c2bcd9..4a9fa6572d8 100644
--- a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { virtualCardDisplayTypes } from "metabase-types/api";
import { EmptyVizState, type EmptyVizStateProps } from "./EmptyVizState";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
index 65b2552fbcc..0096ab23ae4 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
@@ -1,4 +1,8 @@
import { setupTableEndpoints } from "__support__/server-mocks";
+import {
+ createMockQueryBuilderState,
+ createMockState,
+} from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import { testDataset } from "__support__/testDataset";
import {
@@ -7,10 +11,6 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { getMetadata } from "metabase/metadata-store";
-import {
- createMockQueryBuilderState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail/ObjectDetail";
import type { ObjectDetailProps } from "metabase/visualizations/components/ObjectDetail/types";
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization-loading.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization-loading.unit.spec.tsx
index 25c433e1478..4cc74e9dcff 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization-loading.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization-loading.unit.spec.tsx
@@ -1,9 +1,9 @@
import type { ComponentProps } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { delay } from "__support__/utils";
-import { createMockState } from "metabase/redux/store/mocks";
import VisualizationComponent from "metabase/visualizations/components/Visualization";
import type { Visualization } from "metabase/visualizations/types";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
index c4e7d33a550..e92c78337cd 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
@@ -1,9 +1,9 @@
import type { ComponentProps } from "react";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders, screen } from "__support__/ui";
import { delay } from "__support__/utils";
-import { createMockState } from "metabase/redux/store/mocks";
import { color } from "metabase/ui/colors";
import VisualizationComponent from "metabase/visualizations/components/Visualization";
import { registerVisualizations } from "metabase/visualizations/register";
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.stories.tsx b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.stories.tsx
index ee959824a93..a0b8c9c5a83 100644
--- a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.stories.tsx
@@ -1,11 +1,8 @@
import type { StoryFn } from "@storybook/react";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { VisualizationWrapper } from "__support__/storybook";
import { NumberColumn, StringColumn } from "__support__/visualizations";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import Visualization from "metabase/visualizations/components/Visualization";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.stories.tsx
index 4a1d9cd76eb..533894dc211 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.stories.tsx
@@ -1,11 +1,8 @@
import type { StoryFn } from "@storybook/react";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { VisualizationWrapper } from "__support__/storybook";
import { NumberColumn, StringColumn } from "__support__/visualizations";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import Visualization from "metabase/visualizations/components/Visualization";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx
index 947ffbd6aae..6f7654f4948 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/tests/setup.tsx
@@ -1,7 +1,7 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { renderWithProviders } from "__support__/ui";
-import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
import type { TokenFeatures } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.stories.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.stories.tsx
index dc90476facf..c37f8f80e03 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.stories.tsx
@@ -1,14 +1,11 @@
import type { StoryFn } from "@storybook/react";
+import { createMockSettingsState, createMockState } from "__support__/state";
import {
SdkVisualizationWrapper,
VisualizationWrapper,
} from "__support__/storybook";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import Visualization from "metabase/visualizations/components/Visualization";
import { registerVisualization } from "metabase/viz-core";
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
index b6d8a578961..20519be9475 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
@@ -3,6 +3,7 @@ import type { StoryFn } from "@storybook/react";
import { getCommonStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
SdkVisualizationWrapper,
@@ -12,10 +13,6 @@ import {
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import Visualization from "metabase/visualizations/components/Visualization";
diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx
index fb7af14940b..dcaa0a4ab90 100644
--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx
+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.dashboard.stories.tsx
@@ -6,6 +6,11 @@ import { type ReactNode, useEffect, useMemo } from "react";
import _ from "underscore";
import { getStore } from "__support__/entities-store";
+import {
+ createMockDashboardState,
+ createMockSettingsState,
+ createMockState,
+} from "__support__/state";
import { getNextId } from "__support__/utils";
import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";
import { Api } from "metabase/api";
@@ -13,11 +18,6 @@ import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";
import { publicReducers } from "metabase/reducers-public";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockDashboardState,
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Dashboard } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx
index 9ce0985bb3f..1f4aa17ceda 100644
--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx
+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.document.stories.tsx
@@ -6,6 +6,7 @@ import _ from "underscore";
import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
+import { createMockState } from "__support__/state";
import { createMockEntitiesState } from "__support__/store";
import {
ForceDocumentCardRenderDecorator,
@@ -18,7 +19,6 @@ import { Editor } from "metabase/documents/components/Editor/Editor";
import { commonReducers } from "metabase/reducers-common";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import {
createMockCard,
createMockCardQueryMetadata,
diff --git a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx
index 7e7bfd826b6..f1eb034c5e2 100644
--- a/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx
+++ b/frontend/test/__support__/custom-viz-fixtures/CalendarHeatmap.question.stories.tsx
@@ -5,6 +5,7 @@ import { type ReactNode, useEffect, useMemo } from "react";
import { getStore } from "__support__/entities-store";
import { createMockMetadata } from "__support__/metadata";
+import { createMockSettingsState, createMockState } from "__support__/state";
import { getNextId } from "__support__/utils";
import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";
import { Api } from "metabase/api";
@@ -14,10 +15,6 @@ import {
} from "metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView";
import { publicReducers } from "metabase/reducers-public";
import { MetabaseReduxProvider } from "metabase/redux";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import {
createMockCard,
createMockDataset,
diff --git a/frontend/test/__support__/enterprise.js b/frontend/test/__support__/enterprise.js
index f9686385206..c157093e7df 100644
--- a/frontend/test/__support__/enterprise.js
+++ b/frontend/test/__support__/enterprise.js
@@ -3,7 +3,7 @@ import { ENTERPRISE_PLUGIN_NAME_MAPPING } from "./enterprise-typed";
/**
* @deprecated use setupEnterprisePlugins with settings set via mockSettings
* ```ts
- * import { createMockState } from "metabase/redux/store/mocks";
+ * import { createMockState } from "__support__/state";
* import { mockSettings } from "__support__/settings";
* import {
* createMockTokenFeatures,
diff --git a/frontend/test/__support__/entities-store.ts b/frontend/test/__support__/entities-store.ts
index e0d81e6c36a..8af908b810f 100644
--- a/frontend/test/__support__/entities-store.ts
+++ b/frontend/test/__support__/entities-store.ts
@@ -2,6 +2,7 @@ import type { Middleware, Reducer } from "@reduxjs/toolkit";
import { combineReducers, configureStore } from "@reduxjs/toolkit";
import _ from "underscore";
+import { type StoreSeedState, seedApiQueryCache } from "__support__/state";
import { Api } from "metabase/api";
import {
entitiesReducer,
@@ -11,10 +12,6 @@ import { commonReducers } from "metabase/reducers-common";
import { mainReducers } from "metabase/reducers-main";
import { publicReducers } from "metabase/reducers-public";
import type { State } from "metabase/redux/store";
-import {
- type StoreSeedState,
- seedApiQueryCache,
-} from "metabase/redux/store/mocks";
// Re-exported from the test-support tier so specs can build a main-app store
// without importing `metabase/reducers-main` directly, which would
diff --git a/frontend/test/__support__/metadata.ts b/frontend/test/__support__/metadata.ts
index 312a2b1504b..d0268edce23 100644
--- a/frontend/test/__support__/metadata.ts
+++ b/frontend/test/__support__/metadata.ts
@@ -1,9 +1,6 @@
+import { createMockSettingsState, createMockState } from "__support__/state";
import type { MetadataSelectorOpts } from "metabase/metadata-store";
import { getMetadata } from "metabase/metadata-store";
-import {
- createMockSettingsState,
- createMockState,
-} from "metabase/redux/store/mocks";
import type { Settings } from "metabase-types/api";
import type { EntitiesStateOpts } from "./store";
diff --git a/frontend/test/__support__/settings.ts b/frontend/test/__support__/settings.ts
index c2f659b314e..c3ad9fac278 100644
--- a/frontend/test/__support__/settings.ts
+++ b/frontend/test/__support__/settings.ts
@@ -1,4 +1,4 @@
-import { createMockSettingsState } from "metabase/redux/store/mocks";
+import { createMockSettingsState } from "__support__/state";
import MetabaseSettings from "metabase/utils/settings";
import type { EnterpriseSettings, Settings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/redux/store/mocks/admin.ts b/frontend/test/__support__/state/admin.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/admin.ts
rename to frontend/test/__support__/state/admin.ts
diff --git a/frontend/src/metabase/redux/store/mocks/api.ts b/frontend/test/__support__/state/api.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/api.ts
rename to frontend/test/__support__/state/api.ts
diff --git a/frontend/src/metabase/redux/store/mocks/app.ts b/frontend/test/__support__/state/app.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/app.ts
rename to frontend/test/__support__/state/app.ts
diff --git a/frontend/src/metabase/redux/store/mocks/auth.ts b/frontend/test/__support__/state/auth.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/auth.ts
rename to frontend/test/__support__/state/auth.ts
diff --git a/frontend/src/metabase/redux/store/mocks/dashboard.ts b/frontend/test/__support__/state/dashboard.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/dashboard.ts
rename to frontend/test/__support__/state/dashboard.ts
diff --git a/frontend/src/metabase/redux/store/mocks/downloads.ts b/frontend/test/__support__/state/downloads.ts
similarity index 77%
rename from frontend/src/metabase/redux/store/mocks/downloads.ts
rename to frontend/test/__support__/state/downloads.ts
index 3c944991f66..7f851a4c05d 100644
--- a/frontend/src/metabase/redux/store/mocks/downloads.ts
+++ b/frontend/test/__support__/state/downloads.ts
@@ -1,4 +1,4 @@
-import type { Download } from "../downloads";
+import type { Download } from "metabase/redux/store";
export const createMockDownload = (props: Partial<Download> = {}): Download => {
return {
diff --git a/frontend/src/metabase/redux/store/mocks/embed.ts b/frontend/test/__support__/state/embed.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/embed.ts
rename to frontend/test/__support__/state/embed.ts
diff --git a/frontend/src/metabase/redux/store/mocks/embedding-data-picker.ts b/frontend/test/__support__/state/embedding-data-picker.ts
similarity index 76%
rename from frontend/src/metabase/redux/store/mocks/embedding-data-picker.ts
rename to frontend/test/__support__/state/embedding-data-picker.ts
index deaee91cc6c..9b2db2a5461 100644
--- a/frontend/src/metabase/redux/store/mocks/embedding-data-picker.ts
+++ b/frontend/test/__support__/state/embedding-data-picker.ts
@@ -1,6 +1,5 @@
import { DEFAULT_EMBEDDING_ENTITY_TYPES } from "metabase/redux/embedding-data-picker";
-
-import type { EmbeddingDataPickerState } from "../embedding-data-picker";
+import type { EmbeddingDataPickerState } from "metabase/redux/store/embedding-data-picker";
export const createMockEmbeddingDataPickerState = (
opts?: Partial<EmbeddingDataPickerState>,
diff --git a/frontend/src/metabase/redux/store/mocks/entities.ts b/frontend/test/__support__/state/entities.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/entities.ts
rename to frontend/test/__support__/state/entities.ts
diff --git a/frontend/src/metabase/redux/store/mocks/explorations.ts b/frontend/test/__support__/state/explorations.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/explorations.ts
rename to frontend/test/__support__/state/explorations.ts
diff --git a/frontend/src/metabase/redux/store/mocks/index.ts b/frontend/test/__support__/state/index.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/index.ts
rename to frontend/test/__support__/state/index.ts
diff --git a/frontend/src/metabase/redux/store/mocks/location.ts b/frontend/test/__support__/state/location.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/location.ts
rename to frontend/test/__support__/state/location.ts
diff --git a/frontend/src/metabase/redux/store/mocks/modal.ts b/frontend/test/__support__/state/modal.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/modal.ts
rename to frontend/test/__support__/state/modal.ts
diff --git a/frontend/src/metabase/redux/store/mocks/parameters.ts b/frontend/test/__support__/state/parameters.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/parameters.ts
rename to frontend/test/__support__/state/parameters.ts
diff --git a/frontend/src/metabase/redux/store/mocks/qb.ts b/frontend/test/__support__/state/qb.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/qb.ts
rename to frontend/test/__support__/state/qb.ts
diff --git a/frontend/src/metabase/redux/store/mocks/settings.ts b/frontend/test/__support__/state/settings.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/settings.ts
rename to frontend/test/__support__/state/settings.ts
diff --git a/frontend/src/metabase/redux/store/mocks/setup.ts b/frontend/test/__support__/state/setup.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/setup.ts
rename to frontend/test/__support__/state/setup.ts
diff --git a/frontend/src/metabase/redux/store/mocks/state.ts b/frontend/test/__support__/state/state.ts
similarity index 100%
rename from frontend/src/metabase/redux/store/mocks/state.ts
rename to frontend/test/__support__/state/state.ts
diff --git a/frontend/src/metabase/redux/store/mocks/upload.ts b/frontend/test/__support__/state/upload.ts
similarity index 82%
rename from frontend/src/metabase/redux/store/mocks/upload.ts
rename to frontend/test/__support__/state/upload.ts
index 87ac3be2fdc..89591ddbffc 100644
--- a/frontend/src/metabase/redux/store/mocks/upload.ts
+++ b/frontend/test/__support__/state/upload.ts
@@ -1,4 +1,4 @@
-import type { FileUpload } from "../upload";
+import type { FileUpload } from "metabase/redux/store/upload";
export const createMockUploadState = (uploads = {}) => {
return { ...uploads };
diff --git a/frontend/src/metabase/redux/store/mocks/visualizer.ts b/frontend/test/__support__/state/visualizer.ts
similarity index 85%
rename from frontend/src/metabase/redux/store/mocks/visualizer.ts
rename to frontend/test/__support__/state/visualizer.ts
index 73b357b90c7..fbd0fd7c6f8 100644
--- a/frontend/src/metabase/redux/store/mocks/visualizer.ts
+++ b/frontend/test/__support__/state/visualizer.ts
@@ -1,4 +1,4 @@
-import type { VisualizerState } from "../visualizer";
+import type { VisualizerState } from "metabase/redux/store/visualizer";
export const createMockVisualizerState = (
opts?: Partial<VisualizerState>,
diff --git a/frontend/test/__support__/storybook.tsx b/frontend/test/__support__/storybook.tsx
index 3ed37aaf535..9fac2bc7931 100644
--- a/frontend/test/__support__/storybook.tsx
+++ b/frontend/test/__support__/storybook.tsx
@@ -4,13 +4,13 @@ import createAsyncCallback from "@loki/create-async-callback";
import type { StoryFn } from "@storybook/react";
import { useEffect, useMemo } from "react";
+import { createMockState } from "__support__/state";
import { SdkThemeProvider } from "embedding-sdk-bundle/components/private/SdkThemeProvider";
import { PrintContext } from "metabase/documents/contexts/PrintContext";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
import { mainReducers } from "metabase/reducers-main";
import { MetabaseReduxProvider } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import { createMockState } from "metabase/redux/store/mocks";
import { StaticVisualization } from "metabase/static-viz/components/StaticVisualization";
import { createStaticRenderingContext } from "metabase/static-viz/lib/rendering-context";
import type { MantineThemeOverride } from "metabase/ui";
diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsx
index 2580a623afe..83dabd85e2d 100644
--- a/frontend/test/__support__/ui.tsx
+++ b/frontend/test/__support__/ui.tsx
@@ -28,6 +28,7 @@ import { createPortal } from "react-dom";
import _ from "underscore";
import "metabase/auth/plugins";
+import { type StoreSeedState, createMockState } from "__support__/state";
import { AppColorSchemeProvider } from "metabase/AppColorSchemeProvider";
import { AppKBarProvider } from "metabase/AppKBarProvider";
import { Api } from "metabase/api";
@@ -37,10 +38,6 @@ import { makeMainReducers } from "metabase/reducers-main";
import { publicReducers } from "metabase/reducers-public";
import { MetabaseReduxProvider, useDispatch } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import {
- type StoreSeedState,
- createMockState,
-} from "metabase/redux/store/mocks";
import {
type Location,
type MemoryTestRouterHolder,