From e5e66bea25719ae338b89badbdbcd54f6b041275 Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Tue, 27 Aug 2024 09:58:05 +0200
Subject: [PATCH] refactor: use mockErrorHandler instead of MiddlewareFactory
 in tests

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 .../httpRouter/createCredentialsBarrier.test.ts   | 14 ++++++--------
 .../scaffolder-backend/src/service/router.test.ts | 11 ++++++-----
 plugins/search-backend/src/service/router.test.ts | 15 ++++++++-------
 .../signals-backend/src/service/router.test.ts    |  9 ++-------
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts b/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts
index 124acf277b..22c6c90f05 100644
--- a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts
+++ b/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.test.ts
@@ -19,13 +19,11 @@
 import express from 'express';
 import request from 'supertest';
 import { createCredentialsBarrier } from './createCredentialsBarrier';
-import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
-import { MiddlewareFactory } from '../rootHttpRouter/http';
-
-const errorMiddleware = MiddlewareFactory.create({
-  config: mockServices.rootConfig(),
-  logger: mockServices.rootLogger(),
-}).error();
+import {
+  mockCredentials,
+  mockErrorHandler,
+  mockServices,
+} from '@backstage/backend-test-utils';
 
 function setup() {
   const barrier = createCredentialsBarrier({
@@ -37,7 +35,7 @@ function setup() {
 
   const app = express();
   app.use(barrier.middleware);
-  app.use(errorMiddleware);
+  app.use(mockErrorHandler());
   app.get('*', (_req, res) => res.status(200).end());
 
   return { app, barrier };
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 51e11d630f..9673d19255 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -44,9 +44,12 @@ import {
   AuthorizeResult,
   PermissionEvaluator,
 } from '@backstage/plugin-permission-common';
-import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
+import {
+  mockCredentials,
+  mockErrorHandler,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
 import { UrlReaders } from '@backstage/backend-defaults/urlReader';
 
 const mockAccess = jest.fn();
@@ -1501,8 +1504,6 @@ data: {"id":1,"taskId":"a-random-id","type":"completion","createdAt":"","body":{
           results: [{ title: 'blob' }],
         });
 
-        const logger = mockServices.logger.mock();
-        const middleware = MiddlewareFactory.create({ config, logger });
         const router = await createRouter({
           logger: loggerToWinstonLogger(mockServices.logger.mock()),
           config: new ConfigReader({}),
@@ -1519,7 +1520,7 @@ data: {"id":1,"taskId":"a-random-id","type":"completion","createdAt":"","body":{
           },
         });
 
-        app = express().use(router).use(middleware.error());
+        app = express().use(router).use(mockErrorHandler());
       });
 
       it('should throw an error when the provider is not registered', async () => {
diff --git a/plugins/search-backend/src/service/router.test.ts b/plugins/search-backend/src/service/router.test.ts
index d5a2b89f1e..d22fc17e54 100644
--- a/plugins/search-backend/src/service/router.test.ts
+++ b/plugins/search-backend/src/service/router.test.ts
@@ -25,9 +25,12 @@ import request from 'supertest';
 import { createRouter } from './router';
 import { wrapInOpenApiTestServer } from '@backstage/backend-openapi-utils';
 import { Server } from 'http';
-import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
+import {
+  mockCredentials,
+  mockErrorHandler,
+  mockServices,
+} from '@backstage/backend-test-utils';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
 
 const mockPermissionEvaluator: PermissionEvaluator = {
   authorize: () => {
@@ -84,11 +87,9 @@ describe('createRouter', () => {
       auth: mockServices.auth(),
       httpAuth: mockServices.httpAuth(),
     });
-    const errorHandler = MiddlewareFactory.create({
-      config: mockServices.rootConfig(),
-      logger: mockServices.rootLogger(),
-    }).error();
-    app = wrapInOpenApiTestServer(express().use(router).use(errorHandler));
+    app = wrapInOpenApiTestServer(
+      express().use(router).use(mockErrorHandler()),
+    );
   });
 
   beforeEach(() => {
diff --git a/plugins/signals-backend/src/service/router.test.ts b/plugins/signals-backend/src/service/router.test.ts
index b5c26a3408..8584a06dea 100644
--- a/plugins/signals-backend/src/service/router.test.ts
+++ b/plugins/signals-backend/src/service/router.test.ts
@@ -24,8 +24,7 @@ import {
   UserInfoService,
 } from '@backstage/backend-plugin-api';
 import { ConfigReader } from '@backstage/config';
-import { mockServices } from '@backstage/backend-test-utils';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import { mockErrorHandler, mockServices } from '@backstage/backend-test-utils';
 
 const eventsServiceMock: jest.Mocked<EventsService> = {
   subscribe: jest.fn(),
@@ -53,11 +52,7 @@ describe('createRouter', () => {
       config: new ConfigReader({}),
       auth: mockServices.auth(),
     });
-    const errorHandler = MiddlewareFactory.create({
-      config: mockServices.rootConfig(),
-      logger: mockServices.rootLogger(),
-    }).error();
-    app = express().use(router).use(errorHandler);
+    app = express().use(router).use(mockErrorHandler());
   });
 
   beforeEach(() => {