From 3bd7516c8ee2e9322d4326e9ca9107cbf7ad3fb7 Mon Sep 17 00:00:00 2001
From: David Festal <dfestal@redhat.com>
Date: Mon, 28 Aug 2023 21:56:57 +0200
Subject: [PATCH] Fixes after rebase to master

Signed-off-by: David Festal <dfestal@redhat.com>
---
 packages/backend-plugin-manager/README.md        | 16 ++++------------
 .../src/manager/plugin-manager.test.ts           | 11 +++++++++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/backend-plugin-manager/README.md b/packages/backend-plugin-manager/README.md
index 42b68739a9..c9fd666fb3 100644
--- a/packages/backend-plugin-manager/README.md
+++ b/packages/backend-plugin-manager/README.md
@@ -17,19 +17,11 @@ The backend plugin manager is a service that scans a configured root directory (
 In the `backend-next` application, it can be enabled by adding the `backend-plugin-manager` as a dependency in the `package.json` and the following lines in the `src/index.ts` file:
 
 ```ts
--
--const backend = createBackend();
-+import {
-+  dynamicPluginsServiceFactory,
-+  dynamicPluginsFeatureDiscoveryServiceFactory,
-+} from '@backstage/backend-plugin-manager';
+const backend = createBackend();
++
++ backend.add(dynamicPluginsFeatureDiscoveryServiceFactory()) // overridden version of the FeatureDiscoveryService which provides features loaded by dynamic plugins
++ backend.add(dynamicPluginsServiceFactory())
 +
-+const backend = createBackend({
-+  services: [
-+    dynamicPluginsServiceFactory(),
-+    dynamicPluginsFeatureDiscoveryServiceFactory(), // overridden version of the FeatureDiscoveryService which provides features loaded by dynamic plugins
-+  ],
-+});
 ```
 
 ### About the expected dynamic plugin structure
diff --git a/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts b/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts
index 9d086092b9..8c54538b5e 100644
--- a/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts
+++ b/packages/backend-plugin-manager/src/manager/plugin-manager.test.ts
@@ -486,7 +486,7 @@ describe('backend-plugin-manager', () => {
       };
 
       const backend = createSpecializedBackend({
-        services: [
+        defaultServiceFactories: [
           rootLifecycleServiceFactory(),
           createServiceFactory({
             service: coreServices.rootConfig,
@@ -494,7 +494,14 @@ describe('backend-plugin-manager', () => {
             async factory({}) {
               return await ConfigSources.toConfig({
                 async *readConfigData() {
-                  yield { configs: [] };
+                  yield {
+                    configs: [
+                      {
+                        context: 'test',
+                        data: {},
+                      },
+                    ],
+                  };
                 },
               });
             },