refactor: test updates for Lifecycle change

forcedotcom · Jun 27, 2023 · e0d3124 · e0d3124
1 parent 789dcc4
commit e0d3124
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/org/scratchOrgLifecycleEvents.ts b/src/org/scratchOrgLifecycleEvents.ts
@@ -8,8 +8,6 @@ import { Lifecycle } from '../lifecycleEvents';
 import { AuthFields } from './authInfo';
 import { ScratchOrgInfo } from './scratchOrgTypes';
 
-const emitter = Lifecycle.getInstance();
-
 export const scratchOrgLifecycleEventName = 'scratchOrgLifecycleEvent';
 export const scratchOrgLifecycleStages = [
   'prepare request',
@@ -26,7 +24,7 @@ export interface ScratchOrgLifecycleEvent {
 }
 
 export const emit = async (event: ScratchOrgLifecycleEvent): Promise<void> =>
-  emitter.emit(scratchOrgLifecycleEventName, event);
+  Lifecycle.getInstance().emit(scratchOrgLifecycleEventName, event);
 
 const postOrgCreateHookFields = [
   'accessToken',
@@ -47,7 +45,7 @@ const isHookField = (key: string): key is (typeof postOrgCreateHookFields)[numbe
   postOrgCreateHookFields.includes(key as (typeof postOrgCreateHookFields)[number]);
 
 export const emitPostOrgCreate = async (authFields: AuthFields): Promise<void> => {
-  await emitter.emit(
+  await Lifecycle.getInstance().emit(
     'postorgcreate',
     Object.fromEntries(Object.entries(authFields).filter(([key]) => isHookField(key))) as PostOrgCreateHook
   );

diff --git a/test/unit/lifecycleEventsTest.ts b/test/unit/lifecycleEventsTest.ts
@@ -26,7 +26,7 @@ describe('lifecycleEvents', () => {
   const fake = new Foo();
 
   beforeEach(() => {
-    loggerSpy = spyMethod($$.SANDBOX, Lifecycle.getInstance(), 'debug');
+    loggerSpy = spyMethod($$.SANDBOX, $$.TEST_LOGGER, 'debug');
     fakeSpy = spyMethod($$.SANDBOX, fake, 'bar');
   });