Fix component mocking not re-creating instances

installed-tests/fixtures/utils.js

@@ -222,11 +222,16 @@ function isolateDirectories() {
  * Patch in the mock components for plugin tests.
  */
 export async function mockComponents() {
-    const {components} = await import(`file://${Config.PACKAGE_DATADIR}/service/components/index.js`);
+    const {functionOverrides} = await import(`file://${Config.PACKAGE_DATADIR}/service/components/index.js`);
     const MockComponents = await import('./components/index.js');
 
-    for (const [name, module] of Object.entries(MockComponents))
-        components[name] = module;
+    functionOverrides.acquire = function (name) {
+        return new MockComponents[name].default();
+    };
+
+    functionOverrides.release = function (name) {
+        return null;
+    };
 }
 
 /**

src/service/components/index.js

@@ -14,7 +14,9 @@ import * as sound from './sound.js';
 import * as upower from './upower.js';
 import * as ydotool from './ydotool.js';
 
-export const components = {
+export const functionOverrides = {};
+
+const components = {
     atspi,
     clipboard,
     contacts,
@@ -42,6 +44,9 @@ const Default = new Map();
  * @return {*} The default instance of a component
  */
 export function acquire(name) {
+    if (functionOverrides.acquire)
+        return functionOverrides.acquire(name);
+
     let component;
 
     try {
@@ -76,6 +81,9 @@ export function acquire(name) {
  * @return {null} A %null value, useful for overriding a traced variable
  */
 export function release(name) {
+    if (functionOverrides.release)
+        return functionOverrides.release(name);
+
     try {
         const info = Default.get(name);