diff --git a/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx b/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx index 41b9ed412e..5776388516 100644 --- a/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx +++ b/packages/core/src/common/utils/reactive-now/reactive-now.test.tsx @@ -8,8 +8,8 @@ import type { IComputedValue } from "mobx"; import { computed, observe } from "mobx"; import React from "react"; import { observer } from "mobx-react"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import { reactiveNow } from "./reactive-now"; +import { advanceFakeTime, testUsingFakeTime } from "../../../test-utils/use-fake-time"; describe("reactiveNow", () => { let someComputed: IComputedValue; diff --git a/packages/core/src/features/application-menu/application-menu.test.ts b/packages/core/src/features/application-menu/application-menu.test.ts index 68bc0223b9..bd9d016548 100644 --- a/packages/core/src/features/application-menu/application-menu.test.ts +++ b/packages/core/src/features/application-menu/application-menu.test.ts @@ -5,7 +5,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths"; import platformInjectable, { allPlatforms } from "../../common/vars/platform.injectable"; diff --git a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts index 17bfcd297a..465fa48f54 100644 --- a/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts +++ b/packages/core/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts @@ -5,7 +5,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths"; import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; diff --git a/packages/core/src/features/application-update/analytics-for-installing-update.test.ts b/packages/core/src/features/application-update/analytics-for-installing-update.test.ts index 1abf8aadb9..e93c414027 100644 --- a/packages/core/src/features/application-update/analytics-for-installing-update.test.ts +++ b/packages/core/src/features/application-update/analytics-for-installing-update.test.ts @@ -17,7 +17,7 @@ import type { DownloadPlatformUpdate } from "./main/download-update/download-pla import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable"; import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable"; import periodicalCheckForUpdatesInjectable from "./child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import getBuildVersionInjectable from "../../main/vars/build-version/get-build-version.injectable"; diff --git a/packages/core/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx b/packages/core/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx index 59e941d8a9..d2b83844a4 100644 --- a/packages/core/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx +++ b/packages/core/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx @@ -16,7 +16,7 @@ import type { ApplicationBuilder } from "../../../../renderer/components/test-ut import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { testUsingFakeTime, advanceFakeTime } from "../../../../test-utils/use-fake-time"; function daysToMilliseconds(days: number) { return Math.round(days * 24 * 60 * 60 * 1000); diff --git a/packages/core/src/features/application-update/child-features/force-update/force-update.test.ts b/packages/core/src/features/application-update/child-features/force-update/force-update.test.ts index fc6a1a3197..1f35592dc7 100644 --- a/packages/core/src/features/application-update/child-features/force-update/force-update.test.ts +++ b/packages/core/src/features/application-update/child-features/force-update/force-update.test.ts @@ -14,11 +14,11 @@ import type { DiContainer } from "@ogre-tools/injectable"; import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; import type { RenderResult } from "@testing-library/react"; import { fireEvent } from "@testing-library/react"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable"; import timeAfterUpdateMustBeInstalledInjectable from "./renderer/force-update-modal/time-after-update-must-be-installed.injectable"; import secondsAfterInstallStartsInjectable from "./renderer/force-update-modal/seconds-after-install-starts.injectable"; import forceUpdateModalRootFrameComponentInjectable from "./renderer/force-update-modal/force-update-modal-root-frame-component.injectable"; +import { testUsingFakeTime, advanceFakeTime } from "../../../../test-utils/use-fake-time"; const TIME_AFTER_UPDATE_MUST_BE_INSTALLED = 1000; const TIME_AFTER_INSTALL_STARTS = 5 * 1000; diff --git a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts index e1be9f45c1..63dfb4cc14 100644 --- a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts +++ b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts @@ -9,7 +9,7 @@ import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/fea import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable"; import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable"; import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { testUsingFakeTime, advanceFakeTime } from "../../../../test-utils/use-fake-time"; const ENOUGH_TIME = 1000 * 60 * 60 * 2; diff --git a/packages/core/src/features/application-update/installing-update.test.ts b/packages/core/src/features/application-update/installing-update.test.ts index cdc24a4a0a..719bb879bf 100644 --- a/packages/core/src/features/application-update/installing-update.test.ts +++ b/packages/core/src/features/application-update/installing-update.test.ts @@ -16,7 +16,7 @@ import type { DownloadPlatformUpdate } from "./main/download-update/download-pla import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable"; import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable"; -import { testUsingFakeTime } from "@k8slens/test-utils"; +import { testUsingFakeTime } from "../../test-utils/use-fake-time"; import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable"; describe("installing update", () => { diff --git a/packages/core/src/features/catalog/entity-running.test.tsx b/packages/core/src/features/catalog/entity-running.test.tsx index e3a4438da5..cfe3b8bf92 100644 --- a/packages/core/src/features/catalog/entity-running.test.tsx +++ b/packages/core/src/features/catalog/entity-running.test.tsx @@ -12,8 +12,8 @@ import type { CatalogEntityActionContext } from "../../common/catalog"; import { CatalogCategory, categoryVersion, CatalogEntity } from "../../common/catalog"; import catalogCategoryRegistryInjectable from "../../common/catalog/category-registry.injectable"; import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; -import { flushPromises } from "../../common/test-utils/flush-promises"; -import { advanceFakeTime, testUsingFakeTime } from "../../common/test-utils/use-fake-time"; +import { flushPromises } from "@k8slens/test-utils"; +import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; import type { CatalogEntityOnBeforeRun, CatalogEntityRegistry } from "../../renderer/api/catalog/entity/registry"; import catalogEntityRegistryInjectable from "../../renderer/api/catalog/entity/registry.injectable"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; diff --git a/packages/core/src/features/catalog/opening-entity-details.test.tsx b/packages/core/src/features/catalog/opening-entity-details.test.tsx index 0bfde28a7c..a47f139e80 100644 --- a/packages/core/src/features/catalog/opening-entity-details.test.tsx +++ b/packages/core/src/features/catalog/opening-entity-details.test.tsx @@ -9,7 +9,7 @@ import { KubernetesCluster, WebLink } from "../../common/catalog-entities"; import getClusterByIdInjectable from "../../common/cluster-store/get-by-id.injectable"; import { Cluster } from "../../common/cluster/cluster"; import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "../../common/test-utils/use-fake-time"; +import { advanceFakeTime, testUsingFakeTime } from "../../test-utils/use-fake-time"; import catalogEntityRegistryInjectable from "../../renderer/api/catalog/entity/registry.injectable"; import showEntityDetailsInjectable from "../../renderer/components/+catalog/entity-details/show.injectable"; import { type ApplicationBuilder, getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; diff --git a/packages/core/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx b/packages/core/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx index 39f9a824ee..46b84c44e3 100644 --- a/packages/core/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx +++ b/packages/core/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx @@ -14,7 +14,7 @@ import { Cluster } from "../../../common/cluster/cluster"; import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; -import { advanceFakeTime } from "@k8slens/test-utils"; +import { advanceFakeTime } from "../../../test-utils/use-fake-time"; const currentClusterServerUrl = "https://localhost"; const nonCurrentClusterServerUrl = "http://localhost"; diff --git a/packages/core/src/features/cluster/kube-object-status-icon/show-status-for-a-kube-object.test.tsx b/packages/core/src/features/cluster/kube-object-status-icon/show-status-for-a-kube-object.test.tsx index bc3bafc70b..fde6a1b816 100644 --- a/packages/core/src/features/cluster/kube-object-status-icon/show-status-for-a-kube-object.test.tsx +++ b/packages/core/src/features/cluster/kube-object-status-icon/show-status-for-a-kube-object.test.tsx @@ -5,7 +5,6 @@ import { KubeObjectStatusLevel } from "../../../common/k8s-api/kube-object-status"; import { KubeObject } from "../../../common/k8s-api/kube-object"; import React from "react"; -import { testUsingFakeTime } from "@k8slens/test-utils"; import type { DiContainer } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable"; import type { IAtom } from "mobx"; @@ -20,6 +19,7 @@ import { act } from "@testing-library/react"; import { observer } from "mobx-react"; import { kubeObjectStatusTextInjectionToken } from "../../../renderer/components/kube-object-status-icon/kube-object-status-text-injection-token"; import { KubeObjectStatusIcon } from "../../../renderer/components/kube-object-status-icon"; +import { testUsingFakeTime } from "../../../test-utils/use-fake-time"; describe("show status for a kube object", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx index ef0f595da6..bdac7d43b4 100644 --- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx +++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx @@ -20,8 +20,9 @@ import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable" import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; -import { advanceFakeTime, testUsingFakeTime, flushPromises } from "@k8slens/test-utils"; import storageSaveDelayInjectable from "../../renderer/utils/create-storage/storage-save-delay.injectable"; +import { flushPromises } from "@k8slens/test-utils"; +import { testUsingFakeTime, advanceFakeTime } from "../../test-utils/use-fake-time"; describe("cluster - sidebar and tab navigation for core", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx index b7a1ab8f3c..2ccbb1ab1a 100644 --- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx +++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx @@ -15,12 +15,13 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import assert from "assert"; -import { advanceFakeTime, testUsingFakeTime, flushPromises } from "@k8slens/test-utils"; import type { IObservableValue } from "mobx"; import { runInAction, computed, observable } from "mobx"; import storageSaveDelayInjectable from "../../renderer/utils/create-storage/storage-save-delay.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import type { ClusterPageMenuRegistration } from "../../extensions/common-api/types"; +import { flushPromises } from "@k8slens/test-utils"; +import { testUsingFakeTime, advanceFakeTime } from "../../test-utils/use-fake-time"; describe("cluster - sidebar and tab navigation for extensions", () => { let applicationBuilder: ApplicationBuilder; diff --git a/packages/core/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/packages/core/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts index fbf5daae98..13e73c5c28 100644 --- a/packages/core/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts +++ b/packages/core/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts @@ -18,7 +18,7 @@ import isPathInjectable from "../../renderer/components/input/validators/is-path import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; import type { AsyncResult } from "@k8slens/utilities"; -import { testUsingFakeTime } from "@k8slens/test-utils"; +import { testUsingFakeTime } from "../../test-utils/use-fake-time"; describe("add custom helm repository in preferences", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts b/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts index b63d08f904..a21d44cb92 100644 --- a/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts +++ b/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts @@ -30,7 +30,7 @@ import type { RequestDetailedHelmRelease } from "../../../renderer/components/+h import requestDetailedHelmReleaseInjectable from "../../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable"; import type { RequestHelmReleases } from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; -import { flushPromises } from "../../../common/test-utils/flush-promises"; +import { flushPromises } from "@k8slens/test-utils"; describe("installing helm chart from new tab", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts b/packages/core/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts index 0137ccb30c..27f50d7f94 100644 --- a/packages/core/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts +++ b/packages/core/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts @@ -17,10 +17,10 @@ import type { RequestHelmReleaseConfiguration } from "../../../common/k8s-api/en import requestHelmReleaseConfigurationInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import type { RequestHelmReleases } from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { testUsingFakeTime, advanceFakeTime } from "../../../test-utils/use-fake-time"; describe("New Upgrade Helm Chart Dock Tab", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts index d8cbb09058..3c90e6540b 100644 --- a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -15,7 +15,6 @@ import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpo import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; import requestHelmReleaseUpdateInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; -import { testUsingFakeTime } from "@k8slens/test-utils"; import type { RequestDetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable"; import requestDetailedHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable"; import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; @@ -30,6 +29,7 @@ import requestHelmChartVersionsInjectable from "../../common/k8s-api/endpoints/h import requestHelmChartReadmeInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; import requestHelmChartValuesInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; import { HelmChart } from "../../common/k8s-api/endpoints/helm-charts.api"; +import { testUsingFakeTime } from "../../test-utils/use-fake-time"; describe("showing details for helm release", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts b/packages/core/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts index 5d1b36dcde..bf34068f55 100644 --- a/packages/core/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts +++ b/packages/core/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts @@ -9,7 +9,7 @@ import type { ClusterManager } from "../../main/cluster/manager"; import exitAppInjectable from "../../main/electron-app/features/exit-app.injectable"; import clusterManagerInjectable from "../../main/cluster/manager.injectable"; import stopServicesAndExitAppInjectable from "../../main/stop-services-and-exit-app.injectable"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; +import { testUsingFakeTime, advanceFakeTime } from "../../test-utils/use-fake-time"; describe("quitting the app using application menu", () => { describe("given application has started", () => { diff --git a/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts b/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts index e163a53862..a1d707fb11 100644 --- a/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts +++ b/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { identity } from "lodash/fp"; -import { getGlobalOverride } from "../../../common/test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import telemetryDecoratorInjectable from "./telemetry-decorator.injectable"; export default getGlobalOverride(telemetryDecoratorInjectable, () => ({ diff --git a/packages/core/src/renderer/bootstrap.global-override-for-injectable.ts b/packages/core/src/renderer/bootstrap.global-override-for-injectable.ts index a706ea765f..0e15e59078 100644 --- a/packages/core/src/renderer/bootstrap.global-override-for-injectable.ts +++ b/packages/core/src/renderer/bootstrap.global-override-for-injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getGlobalOverride } from "../common/test-utils/get-global-override"; +import { getGlobalOverride } from "@k8slens/test-utils"; import bootstrapInjectable from "./bootstrap.injectable"; export default getGlobalOverride(bootstrapInjectable, () => ({ diff --git a/packages/core/src/renderer/bootstrap.injectable.ts b/packages/core/src/renderer/bootstrap.injectable.ts index 9bfb492aa9..7cc172e3f1 100644 --- a/packages/core/src/renderer/bootstrap.injectable.ts +++ b/packages/core/src/renderer/bootstrap.injectable.ts @@ -17,7 +17,7 @@ const bootstrapInjectable = getInjectable({ await bootstrap(di); }, - runAfter: di.inject(startFrameInjectable), + runAfter: startFrameInjectable, }), causesSideEffects: true, diff --git a/packages/core/src/renderer/components/countdown/countdown.test.tsx b/packages/core/src/renderer/components/countdown/countdown.test.tsx index 70401c55b7..cdf46ce38e 100644 --- a/packages/core/src/renderer/components/countdown/countdown.test.tsx +++ b/packages/core/src/renderer/components/countdown/countdown.test.tsx @@ -10,10 +10,10 @@ import { renderFor } from "../test-utils/renderFor"; import { Countdown } from "./countdown"; import React from "react"; import type { RenderResult } from "@testing-library/react"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import type { IComputedValue } from "mobx"; import { observe } from "mobx"; import { noop } from "@k8slens/utilities"; +import { testUsingFakeTime, advanceFakeTime } from "../../../test-utils/use-fake-time"; describe("countdown", () => { let di: DiContainer; diff --git a/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx b/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx index 9514e90cc4..472310d0d8 100644 --- a/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx +++ b/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx @@ -7,11 +7,11 @@ import { RenderDelay } from "../render-delay"; import type { DiRender } from "../../test-utils/renderFor"; import { renderFor } from "../../test-utils/renderFor"; import { getDiForUnitTesting } from "../../../getDiForUnitTesting"; -import { advanceFakeTime, testUsingFakeTime } from "@k8slens/test-utils"; import cancelIdleCallbackInjectable from "../cancel-idle-callback.injectable"; import requestIdleCallbackInjectable from "../request-idle-callback.injectable"; import type { RenderResult } from "@testing-library/react"; import idleCallbackTimeoutInjectable from "../idle-callback-timeout.injectable"; +import { testUsingFakeTime, advanceFakeTime } from "../../../../test-utils/use-fake-time"; describe("", () => { let render: DiRender; diff --git a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx index de81c76f73..627fe86fd7 100644 --- a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx +++ b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx @@ -66,18 +66,11 @@ import shouldStartHiddenInjectable from "../../../main/electron-app/features/sho import fsInjectable from "../../../common/fs/fs.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import homeDirectoryPathInjectable from "../../../common/os/home-directory-path.injectable"; -import { testUsingFakeTime } from "@k8slens/test-utils"; import selectedNamespacesStorageInjectable from "../../../features/namespace-filtering/renderer/storage.injectable"; import { registerFeature } from "@k8slens/feature-core"; -import { - applicationFeatureForElectronMain, - testUtils as applicationForElectronTestUtils, -} from "@k8slens/application-for-electron-main"; -import { - applicationFeature, - startApplicationInjectionToken, -} from "@k8slens/application"; - +import { applicationFeatureForElectronMain, testUtils as applicationForElectronTestUtils } from "@k8slens/application-for-electron-main"; +import { applicationFeature, startApplicationInjectionToken } from "@k8slens/application"; +import { testUsingFakeTime } from "../../../test-utils/use-fake-time"; type Callback = (di: DiContainer) => void | Promise; diff --git a/packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx b/packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx index 13f8a53737..4ad315ab98 100644 --- a/packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx +++ b/packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx @@ -22,8 +22,8 @@ import legacyOnChannelListenInjectable from "../../ipc/legacy-channel-listen.inj import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; -import { testUsingFakeTime } from "@k8slens/test-utils"; import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable"; +import { testUsingFakeTime } from "../../../test-utils/use-fake-time"; describe("", () => { let render: () => RenderResult; diff --git a/packages/utility-features/test-utils/src/use-fake-time.ts b/packages/core/src/test-utils/use-fake-time.ts similarity index 100% rename from packages/utility-features/test-utils/src/use-fake-time.ts rename to packages/core/src/test-utils/use-fake-time.ts diff --git a/packages/utility-features/test-utils/index.ts b/packages/utility-features/test-utils/index.ts index 7b49686f9f..ed5afc6535 100644 --- a/packages/utility-features/test-utils/index.ts +++ b/packages/utility-features/test-utils/index.ts @@ -2,4 +2,3 @@ export * from "./src/flush-promises"; export * from "./src/get-global-override-for-function"; export * from "./src/get-global-override"; export * from "./src/get-promise-status"; -export * from "./src/use-fake-time";