From 28cb8fd4fe48d780ac4ee114e961e3bc8b367015 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 5 Oct 2023 13:36:48 +0200
Subject: [PATCH] backend-app-api: refactor test to remove mock-fs

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/backend-app-api/package.json         |  1 -
 .../featureDiscoveryServiceFactory.test.ts    | 55 +++++++++----------
 yarn.lock                                     |  1 -
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 24959ff290..db04e7626c 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -87,7 +87,6 @@
     "@types/node-forge": "^1.3.0",
     "@types/stoppable": "^1.1.0",
     "http-errors": "^2.0.0",
-    "mock-fs": "^5.2.0",
     "supertest": "^6.1.3"
   },
   "configSchema": "config.d.ts",
diff --git a/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts
index 448f1a8ff7..92f34bb94f 100644
--- a/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts
+++ b/packages/backend-app-api/src/alpha/featureDiscoveryServiceFactory.test.ts
@@ -14,28 +14,31 @@
  * limitations under the License.
  */
 
-import mockFs from 'mock-fs';
-import { resolve as resolvePath, dirname } from 'path';
-import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
+import {
+  startTestBackend,
+  mockServices,
+  createMockDirectory,
+} from '@backstage/backend-test-utils';
 import { featureDiscoveryServiceFactory } from './featureDiscoveryServiceFactory';
 
-const rootDir = dirname(process.argv[1]);
+const mockDir = createMockDirectory();
+process.argv[1] = mockDir.path;
+
+const pluginApiPath = require.resolve('@backstage/backend-plugin-api');
 
 describe('featureDiscoveryServiceFactory', () => {
   beforeEach(() => {
-    mockFs({
-      [rootDir]: {
-        'package.json': JSON.stringify({
-          name: 'example-app',
-          dependencies: {
-            'detected-plugin': '0.0.0',
-            'detected-module': '0.0.0',
-            'detected-plugin-with-alpha': '0.0.0',
-            'detected-library': '0.0.0',
-          },
-        }),
-      },
-      [resolvePath(rootDir, 'node_modules/detected-plugin')]: {
+    mockDir.setContent({
+      'package.json': JSON.stringify({
+        name: 'example-app',
+        dependencies: {
+          'detected-plugin': '0.0.0',
+          'detected-module': '0.0.0',
+          'detected-plugin-with-alpha': '0.0.0',
+          'detected-library': '0.0.0',
+        },
+      }),
+      'node_modules/detected-plugin': {
         'package.json': JSON.stringify({
           name: 'detected-plugin',
           main: 'index.js',
@@ -44,7 +47,7 @@ describe('featureDiscoveryServiceFactory', () => {
           },
         }),
         'index.js': `
-        const { createBackendPlugin, coreServices } = require('@backstage/backend-plugin-api');
+        const { createBackendPlugin, coreServices } = require('${pluginApiPath}');
         exports.default = createBackendPlugin({
             pluginId: 'detected',
             register(env) {
@@ -58,7 +61,7 @@ describe('featureDiscoveryServiceFactory', () => {
         });
         `,
       },
-      [resolvePath(rootDir, 'node_modules/detected-module')]: {
+      'node_modules/detected-module': {
         'package.json': JSON.stringify({
           name: 'detected-module',
           main: 'index.js',
@@ -67,7 +70,7 @@ describe('featureDiscoveryServiceFactory', () => {
           },
         }),
         'index.js': `
-        const { createBackendModule, coreServices } = require('@backstage/backend-plugin-api');
+        const { createBackendModule, coreServices } = require('${pluginApiPath}');
         exports.default = createBackendModule({
             pluginId: 'detected',
             moduleId: 'derp',
@@ -82,7 +85,7 @@ describe('featureDiscoveryServiceFactory', () => {
         });
         `,
       },
-      [resolvePath(rootDir, 'node_modules/detected-plugin-with-alpha')]: {
+      'node_modules/detected-plugin-with-alpha': {
         'package.json': JSON.stringify({
           name: 'detected-plugin-with-alpha',
           main: 'index.js',
@@ -101,7 +104,7 @@ describe('featureDiscoveryServiceFactory', () => {
         }),
         'index.js': `exports.default = undefined;`,
         'alpha.js': `
-        const { createBackendPlugin, coreServices } = require('@backstage/backend-plugin-api');
+        const { createBackendPlugin, coreServices } = require('${pluginApiPath}');
         exports.default = createBackendPlugin({
             pluginId: 'detected-alpha',
             register(env) {
@@ -115,7 +118,7 @@ describe('featureDiscoveryServiceFactory', () => {
         });
         `,
       },
-      [resolvePath(rootDir, 'node_modules/detected-library')]: {
+      'node_modules/detected-library': {
         'package.json': JSON.stringify({
           name: 'detected-library',
           main: 'index.js',
@@ -124,7 +127,7 @@ describe('featureDiscoveryServiceFactory', () => {
           },
         }),
         'index.js': `
-        const { createServiceFactory, createServiceRef, coreServices } = require('@backstage/backend-plugin-api');
+        const { createServiceFactory, createServiceRef, coreServices } = require('${pluginApiPath}');
         exports.default = createServiceFactory({
           service: createServiceRef({ id: 'test', scope: 'root' }),
           deps: { logger: coreServices.rootLogger },
@@ -138,10 +141,6 @@ describe('featureDiscoveryServiceFactory', () => {
     });
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it('should detect plugin and module packages when "all" is specified', async () => {
     const mock = mockServices.rootLogger.mock({ child: () => mock });
 
diff --git a/yarn.lock b/yarn.lock
index 56e8fd22bb..4e68a1161b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3415,7 +3415,6 @@ __metadata:
     logform: ^2.3.2
     minimatch: ^5.0.0
     minimist: ^1.2.5
-    mock-fs: ^5.2.0
     morgan: ^1.10.0
     node-forge: ^1.3.1
     selfsigned: ^2.0.0