test: fix unit test config passing

Author: dbajpeyi

injected/entry-points/chrome.js

@@ -1,7 +1,6 @@
 /**
  * @module Chrome integration
  */
-import { isTrackerOrigin } from '../src/trackers';
 import { computeLimitedSiteObject } from '../src/utils';
 
 /**
@@ -39,8 +38,6 @@ function randomString() {
 }
 
 function init() {
-    const trackerLookup = import.meta.trackerLookup;
-    const documentOriginIsTracker = isTrackerOrigin(trackerLookup);
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
     const bundledConfig = $BUNDLED_CONFIG$;
     const randomMethodName = '_d' + randomString();

injected/src/config-feature.js

@@ -13,9 +13,19 @@ export default class ConfigFeature {
 
     /**
      * @param {any} name
+     * @param {import('./content-scope-features.js').LoadArgs} args
      */
-    constructor(name) {
+    constructor(name, args) {
         this.name = name;
+        const { bundledConfig, site, platform } = args;
+        this.#bundledConfig = bundledConfig;
+        this.#args = args;
+        // If we have a bundled config, treat it as a regular config
+        // This will be overriden by the remote config if it is available
+        if (this.#bundledConfig && this.#args) {
+            const enabledFeatures = computeEnabledFeatures(bundledConfig, site.domain, platform.version);
+            this.#args.featureSettings = parseFeatureSettings(bundledConfig, enabledFeatures);
+        }
     }
 
     get args() {
@@ -30,21 +40,6 @@ export default class ConfigFeature {
         return this.#args?.featureSettings;
     }
 
-    /**
-     * @param {import('./content-scope-features.js').LoadArgs} loadArgs
-     */
-    initLoadArgs(loadArgs) {
-        const { bundledConfig, site, platform } = loadArgs;
-        this.#bundledConfig = bundledConfig;
-        this.#args = loadArgs;
-        // If we have a bundled config, treat it as a regular config
-        // This will be overriden by the remote config if it is available
-        if (this.#bundledConfig && this.#args) {
-            const enabledFeatures = computeEnabledFeatures(bundledConfig, site.domain, platform.version);
-            this.#args.featureSettings = parseFeatureSettings(bundledConfig, enabledFeatures);
-        }
-    }
-
     /**
      * Given a config key, interpret the value as a list of domain overrides, and return the elements that match the current page
      * Consider using patchSettings instead as per `getFeatureSetting`.
@@ -161,4 +156,4 @@ export default class ConfigFeature {
     get bundledConfig() {
         return this.#bundledConfig;
     }
-}
+}

injected/src/content-feature.js

@@ -33,9 +33,8 @@ export default class ContentFeature extends ConfigFeature {
     /** @type {ImportMeta} */
     #importConfig;
 
-    constructor(featureName, importConfig) {
-        super(featureName);
-        this.args = null;
+    constructor(featureName, importConfig, args) {
+        super(featureName, args);
         this.monitor = new PerformanceMonitor();
         this.#importConfig = importConfig;
     }
@@ -141,8 +140,6 @@ export default class ContentFeature extends ConfigFeature {
 
     callInit(args) {
         const mark = this.monitor.mark(this.name + 'CallInit');
-        this.args = args;
-        this.platform = args.platform;
         this.init(args);
         mark.end();
         this.measure();
@@ -189,15 +186,15 @@ export default class ContentFeature extends ConfigFeature {
         return this.messaging.subscribe(name, cb);
     }
 
-    /**
-     * @param {import('./content-scope-features.js').LoadArgs} args
-     */
-    callLoad(args) {
-        const mark = this.monitor.mark(this.name + 'CallLoad');
+    setArgs(args) {
         this.args = args;
         this.platform = args.platform;
-        this.initLoadArgs(args);
-        this.load(args);
+    }
+
+    callLoad() {
+        const mark = this.monitor.mark(this.name + 'CallLoad');
+        this.setArgs(this.args);
+        this.load(this.args);
         mark.end();
     }
 

injected/src/content-scope-features.js

@@ -45,8 +45,8 @@ export function load(args) {
 
     for (const featureName of featureNames) {
         const ContentFeature = platformFeatures['ddg_feature_' + featureName];
-        const featureInstance = new ContentFeature(featureName, importConfig);
-        featureInstance.callLoad(args);
+        const featureInstance = new ContentFeature(featureName, importConfig, args);
+        featureInstance.callLoad();
         features.push({ featureName, featureInstance });
     }
     mark.end();

injected/src/globals.d.ts

@@ -44,6 +44,9 @@ declare module '*.riv' {
 }
 
 declare module 'ddg:platformFeatures' {
-    const output: Record<string, new (featureName: string, importConfig: ImportConfig) => import('./content-feature').default>;
+    const output: Record<
+        string,
+        new (featureName: string, importConfig: ImportConfig, args: LoadArgs) => import('./content-feature').default
+    >;
     export default output;
 }

injected/unit-test/content-feature.js

@@ -12,8 +12,8 @@ describe('ContentFeature class', () => {
                 didRun = true;
             }
         }
-        const me = new MyTestFeature('test');
-        me.callInit({
+
+        const args = {
             site: {
                 domain: 'beep.example.com',
             },
@@ -42,7 +42,9 @@ describe('ContentFeature class', () => {
                     ],
                 },
             },
-        });
+        };
+        const me = new MyTestFeature('test', {}, args);
+        me.callInit(args);
         expect(didRun).withContext('Should run').toBeTrue();
     });
 
@@ -56,7 +58,7 @@ describe('ContentFeature class', () => {
         }
         let feature;
         beforeEach(() => {
-            feature = new MyTestFeature('someFeatureName');
+            feature = new MyTestFeature('someFeatureName', {}, {});
         });
 
         it('should not send duplicate flags', () => {
@@ -85,7 +87,7 @@ describe('ContentFeature class', () => {
         }
         let feature;
         beforeEach(() => {
-            feature = new MyTestFeature('someFeatureName');
+            feature = new MyTestFeature('someFeatureName', {}, {});
         });
 
         it('should add debug flag to value descriptors', () => {