From 09892781f7b48f1a76809fc622d2354d33e00f3d Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 24 Mar 2023 16:03:43 -0400
Subject: [PATCH] Fix unit tests falling over

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../persistent-storage/create.injectable.ts       | 15 +++++++--------
 packages/core/src/test-utils/use-fake-time.ts     |  6 +++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/common/persistent-storage/create.injectable.ts b/packages/core/src/common/persistent-storage/create.injectable.ts
index 07513ef910..c5c876c588 100644
--- a/packages/core/src/common/persistent-storage/create.injectable.ts
+++ b/packages/core/src/common/persistent-storage/create.injectable.ts
@@ -4,7 +4,6 @@
  */
 import { disposer, isPromiseLike } from "@k8slens/utilities";
 import { getInjectable } from "@ogre-tools/injectable";
-import type Conf from "conf/dist/source";
 import type { Options } from "conf/dist/source";
 import { isEqual, kebabCase } from "lodash";
 import type { IEqualsComparer } from "mobx";
@@ -13,13 +12,13 @@ import directoryForUserDataInjectable from "../app-paths/directory-for-user-data
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 import loggerInjectable from "../logger.injectable";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
-import { toJS } from "../utils";
 import { enlistMessageChannelListenerInjectionToken, sendMessageToChannelInjectionToken } from "@k8slens/messaging";
 import type { MessageChannel } from "@k8slens/messaging";
 import { persistentStorageIpcChannelPrefixesInjectionToken } from "./channel-prefix";
 import { shouldPersistentStorageDisableSyncInIpcListenerInjectionToken } from "./disable-sync";
 import { persistStateToConfigInjectionToken } from "./save-to-file";
 import type { Migrations } from "./migrations.injectable";
+import { nextTick } from "process";
 
 export interface PersistentStorage {
   /**
@@ -82,7 +81,6 @@ const createPersistentStorageInjectable = getInjectable({
         ...params
       } = rawParams;
       const displayName = kebabCase(params.configName).toUpperCase();
-      const syncDisposers = disposer();
 
       const loadAndStartSyncing = () => {
         logger.info(`[${displayName}]: LOADING ...`);
@@ -100,11 +98,9 @@ const createPersistentStorageInjectable = getInjectable({
           logger.error(`${displayName} extends BaseStore<T>'s fromStore method returns a Promise or promise-like object. This is an error and must be fixed.`);
         }
 
-        startSyncing(config);
         logger.info(`[${displayName}]: LOADED from ${config.path}`);
-      };
 
-      const startSyncing = (config: Conf<T>) => {
+        const syncDisposers = disposer();
         const sendChannel: MessageChannel<T> = {
           id: `${ipcChannelPrefixes.remote}:${config.path}`,
         };
@@ -117,8 +113,9 @@ const createPersistentStorageInjectable = getInjectable({
         const enableSync = () => {
           syncDisposers.push(
             reaction(
-              () => toJS(toJSON()), // unwrap possible observables and react to everything
+              () => toJSON(),
               model => {
+                console.log("here2", { sendChannel });
                 persistStateToConfig(config, model);
                 sendMessageToChannel(sendChannel, model);
               },
@@ -140,7 +137,9 @@ const createPersistentStorageInjectable = getInjectable({
                 }
 
                 if (shouldDisableSyncInListener) {
-                  enableSync();
+                  nextTick(() => {
+                    enableSync();
+                  });
                 }
               },
             }),
diff --git a/packages/core/src/test-utils/use-fake-time.ts b/packages/core/src/test-utils/use-fake-time.ts
index e455984861..11d5fe0918 100644
--- a/packages/core/src/test-utils/use-fake-time.ts
+++ b/packages/core/src/test-utils/use-fake-time.ts
@@ -19,7 +19,11 @@ export const advanceFakeTime = (milliseconds: number) => {
 export const testUsingFakeTime = (dateTime = "2015-10-21T07:28:00Z") => {
   usingFakeTime = true;
 
-  jest.useFakeTimers();
+  jest.useFakeTimers({
+    doNotFake: [
+      "nextTick",
+    ],
+  });
 
   jest.setSystemTime(new Date(dateTime));
 };