chore(app-registry): use scoped globalAppRegistry in withMockedServices helper

Author: gribnoysup

packages/compass-home/src/components/home.spec.tsx

@@ -39,6 +39,9 @@ const createDataService = () => ({
       setName: 'foo',
     };
   },
+  configuredKMSProviders() {
+    return [];
+  },
   on() {},
   off() {},
 });

packages/databases-collections/src/stores/create-namespace.spec.tsx

@@ -11,7 +11,7 @@ import {
 import userEvent from '@testing-library/user-event';
 import { expect } from 'chai';
 
-describe('DropNamespacePlugin', function () {
+describe('CreateNamespacePlugin', function () {
   const sandbox = Sinon.createSandbox();
   const appRegistry = sandbox.spy(new AppRegistry());
   const dataService = {

packages/hadron-app-registry/src/app-registry.ts

@@ -282,8 +282,9 @@ export class AppRegistry {
   }
 
   deactivate() {
-    for (const plugin of Object.values(this.plugins)) {
+    for (const [name, plugin] of Object.entries(this.plugins)) {
       plugin.deactivate?.();
+      this.deregisterPlugin(name);
     }
     for (const event of this.eventNames()) {
       this.removeAllListeners(event);

packages/hadron-app-registry/src/react-context.tsx

@@ -14,10 +14,7 @@ const debug = createDebug('hadron-app-registry:react');
  */
 export const GlobalAppRegistryContext = createContext(globalAppRegistry);
 
-/**
- * @internal exported for the mock plugin helper implementation
- */
-export const LocalAppRegistryContext = createContext<AppRegistry | null>(null);
+const LocalAppRegistryContext = createContext<AppRegistry | null>(null);
 
 type AppRegistryProviderProps =
   | {

packages/hadron-app-registry/src/register-plugin.tsx

@@ -2,15 +2,10 @@ import React, { useRef, useState } from 'react';
 import type { Store as RefluxStore } from 'reflux';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 import type { Actions } from './actions';
-import {
-  type Store,
-  AppRegistry,
-  isReduxStore,
-  globalAppRegistry,
-} from './app-registry';
+import { type Store, AppRegistry, isReduxStore } from './app-registry';
 import {
   GlobalAppRegistryContext,
-  LocalAppRegistryContext,
+  AppRegistryProvider,
   useGlobalAppRegistry,
   useLocalAppRegistry,
 } from './react-context';
@@ -229,8 +224,13 @@ export function registerHadronPlugin<
         mocks: Partial<Registries & Services<S>>
       ): React.FunctionComponent<T> {
         const {
-          globalAppRegistry: _globalAppRegistry,
-          localAppRegistry: _localAppRegistry,
+          // In case globalAppRegistry mock is not provided, we use the one
+          // created in scope so that plugins don't leak their events and
+          // registered metadata on the globalAppRegistry
+          globalAppRegistry = new AppRegistry(),
+          // If localAppRegistry is not explicitly provided, use the passed mock
+          // for global app registry instead
+          localAppRegistry = globalAppRegistry,
           ...mockServices
         } = mocks;
         const mockServiceLocators = Object.fromEntries(
@@ -241,16 +241,10 @@ export function registerHadronPlugin<
         const MockPlugin = registerHadronPlugin(config, mockServiceLocators);
         return function MockPluginWithContext(props: T) {
           return (
-            <GlobalAppRegistryContext.Provider
-              value={_globalAppRegistry ?? globalAppRegistry}
-            >
-              <LocalAppRegistryContext.Provider
-                value={
-                  _localAppRegistry ?? _globalAppRegistry ?? new AppRegistry()
-                }
-              >
+            <GlobalAppRegistryContext.Provider value={globalAppRegistry}>
+              <AppRegistryProvider localAppRegistry={localAppRegistry}>
                 <MockPlugin {...(props as any)}></MockPlugin>
-              </LocalAppRegistryContext.Provider>
+              </AppRegistryProvider>
             </GlobalAppRegistryContext.Provider>
           );
         };