Fix async script.

Author: b4handjr

experimenter/tests/integration/nimbus/utils/filter_expression.js

@@ -1,33 +1,23 @@
-async function remoteSettings(arguments) {
-
+async function remoteSettings(targetingString, recipe) {
     /*
-        Arguments contains 2 items.
-        arguments[0] - the JEXL targeting string
-        arguments[1] - the experiment recipe
+    Arguments contains 2 items.
+    arguments[0] - the JEXL targeting string
+    arguments[1] - the experiment recipe
     */
 
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=1868838 -
     // ASRouterTargeting was moved from browser/components/newtab into
     // browser/components/asrouter and its import path changed.
+
+
     const { TelemetryEnvironment } = ChromeUtils.importESModule("resource://gre/modules/TelemetryEnvironment.sys.mjs");
     await TelemetryEnvironment.onInitialized();
 
-    let ASRouterTargeting;
-
-    try {
-        ASRouterTargeting = ChromeUtils.importESModule("resource:///modules/asrouter/ASRouterTargeting.sys.mjs");
-    } catch (ex) {
-        if (ex.result === Cr.NS_ERROR_FILE_NOT_FOUND) {
-            ASRouterTargeting = ChromeUtils.importESModule("resource://activity-stream/lib/ASRouterTargeting.sys.mjs");
-        } else {
-            throw ex;
-        }
-    }
-    const { ExperimentAPI } = ChromeUtils.importESModule("resource://nimbus/ExperimentAPI.sys.mjs");
+    const ASRouterTargeting = ChromeUtils.importESModule("resource:///modules/asrouter/ASRouterTargeting.sys.mjs");    const { ExperimentAPI } = ChromeUtils.importESModule("resource://nimbus/ExperimentAPI.sys.mjs");
     const TargetingContext = ChromeUtils.importESModule("resource://messaging-system/targeting/Targeting.sys.mjs");
 
-    const _experiment = JSON.parse(arguments[1]);
-    ExperimentAPI.ready();
+    const _experiment = JSON.parse(recipe);
+    await ExperimentAPI.ready();
 
     const context = TargetingContext.TargetingContext.combineContexts(
         _experiment,
@@ -37,20 +27,22 @@ async function remoteSettings(arguments) {
             isMSIX: {},
             isDefaultHandler: {},
             defaultPDFHandler: {}
-        }, // Workaround for supporting background tasks
+        },
         ExperimentAPI._manager.createTargetingContext(),
         ASRouterTargeting.ASRouterTargeting.Environment
     );
+
     const targetingContext = new TargetingContext.TargetingContext(context);
-    let result = false;
     try {
-        result = await targetingContext.evalWithDefault(arguments[0]) !== undefined;
+        const evalResult = await targetingContext.evalWithDefault(targetingString);
+        return evalResult !== undefined;
     } catch (err) {
-        result = null;
+        return null;
     }
-    return result;
 }
 
-let results = remoteSettings(arguments);
+// Get the Selenium callback
+const [targetingString, recipe] = arguments;
+const callback = arguments[arguments.length - 1]
 
-return results;
+remoteSettings(targetingString, recipe).then(callback).catch(() => callback(null));