From 7df5c8875c12058e6b3e61827f074c324e3d82c0 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Thu, 20 Jun 2024 15:41:19 +0200
Subject: [PATCH] backend-defaults: test tweaks

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 .../rootHealthServiceFactory.test.ts          | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
index fd786e2b28..0eee5c18c6 100644
--- a/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHealth/rootHealthServiceFactory.test.ts
@@ -1,6 +1,3 @@
-import { mockServices } from '@backstage/backend-test-utils';
-import { DefaultRootHealthService } from './rootHealthServiceFactory';
-
 /*
  * Copyright 2024 The Backstage Authors
  *
@@ -16,6 +13,10 @@ import { DefaultRootHealthService } from './rootHealthServiceFactory';
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { mockServices } from '@backstage/backend-test-utils';
+import { DefaultRootHealthService } from './rootHealthServiceFactory';
+
 describe('DefaultRootHealthService', () => {
   describe('readiness', () => {
     it(`should return a 500 response if the server hasn't started yet`, async () => {
@@ -32,11 +33,11 @@ describe('DefaultRootHealthService', () => {
     });
 
     it('should return 200 if the server has started', async () => {
-      const lifecycle = mockServices.rootLifecycle.mock();
       let mockServerStartedFn = () => {};
-      lifecycle.addStartupHook.mockImplementation(
-        fn => (mockServerStartedFn = fn),
-      );
+
+      const lifecycle = mockServices.rootLifecycle.mock({
+        addStartupHook: jest.fn(fn => (mockServerStartedFn = fn)),
+      });
 
       const service = new DefaultRootHealthService({
         lifecycle,
@@ -51,18 +52,16 @@ describe('DefaultRootHealthService', () => {
     });
 
     it(`should return a 500 response if the server has stopped`, async () => {
-      const lifecycle = mockServices.rootLifecycle.mock();
       let mockServerStartedFn = () => {};
       let mockServerStoppedFn = () => {};
-      lifecycle.addStartupHook.mockImplementation(
-        fn => (mockServerStartedFn = fn),
-      );
-      lifecycle.addShutdownHook.mockImplementation(
-        fn => (mockServerStoppedFn = fn),
-      );
+
+      const lifecycle = mockServices.rootLifecycle.mock({
+        addStartupHook: jest.fn(fn => (mockServerStartedFn = fn)),
+        addShutdownHook: jest.fn(fn => (mockServerStoppedFn = fn)),
+      });
 
       const service = new DefaultRootHealthService({
-        lifecycle: mockServices.rootLifecycle.mock(),
+        lifecycle,
       });
 
       mockServerStartedFn();