From a6c78b8f15b9998d6e7ac56c3170b3577c5b3628 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 9 Feb 2024 13:08:15 +0100
Subject: [PATCH] events-backend: refactored test to avoid mocking httpRouter

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/service/EventsPlugin.test.ts          | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/plugins/events-backend/src/service/EventsPlugin.test.ts b/plugins/events-backend/src/service/EventsPlugin.test.ts
index e65147ebbb..7f555a0b6f 100644
--- a/plugins/events-backend/src/service/EventsPlugin.test.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.test.ts
@@ -14,21 +14,14 @@
  * limitations under the License.
  */
 
-import { errorHandler } from '@backstage/backend-common';
-import {
-  coreServices,
-  createBackendModule,
-  createServiceFactory,
-} from '@backstage/backend-plugin-api';
+import { createBackendModule } from '@backstage/backend-plugin-api';
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
-import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import {
   TestEventBroker,
   TestEventPublisher,
   TestEventSubscriber,
 } from '@backstage/plugin-events-backend-test-utils';
-import express from 'express';
-import Router from 'express-promise-router';
+import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import request from 'supertest';
 import { eventsPlugin } from './EventsPlugin';
 
@@ -38,11 +31,6 @@ describe('eventPlugin', () => {
     const publisher = new TestEventPublisher();
     const subscriber = new TestEventSubscriber('sub', ['fake']);
 
-    const httpRouter = Router();
-    httpRouter.use(express.json());
-    httpRouter.use(errorHandler());
-    const app = express().use(httpRouter);
-
     const testModule = createBackendModule({
       pluginId: 'events',
       moduleId: 'test',
@@ -60,7 +48,7 @@ describe('eventPlugin', () => {
       },
     });
 
-    await startTestBackend({
+    const { server } = await startTestBackend({
       extensionPoints: [],
       features: [
         eventsPlugin(),
@@ -75,11 +63,6 @@ describe('eventPlugin', () => {
             },
           },
         }),
-        createServiceFactory({
-          service: coreServices.httpRouter,
-          deps: {},
-          factory: async () => httpRouter,
-        }),
       ],
     });
 
@@ -87,8 +70,8 @@ describe('eventPlugin', () => {
     expect(eventBroker.subscribed.length).toEqual(1);
     expect(eventBroker.subscribed[0]).toBe(subscriber);
 
-    const response = await request(app)
-      .post('/http/fake')
+    const response = await request(server)
+      .post('/api/events/http/fake')
       .timeout(1000)
       .send({ test: 'fake' });
     expect(response.status).toBe(202);