Adding instrumentation for in-tree gecko integration tests

mozilla · Jan 15, 2022 · afe073d · afe073d
1 parent e853575
commit afe073d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/extension/controller/experiments/TranslationBar/api.js b/extension/controller/experiments/TranslationBar/api.js
@@ -79,7 +79,7 @@
                 );
 
                 const notificationBox = tab.browser.ownerGlobal.gBrowser.getNotificationBox(tab.browser);
-                let notif = notificationBox.appendNotification(`translation-notification-${chromeWin.now}`, {
+                let notif = notificationBox.appendNotification("fxtranslation-notification", {
                     priority: notificationBox.PRIORITY_INFO_HIGH,
                     notificationIs: `translation-notification-${chromeWin.now}`,
                 });

diff --git a/extension/controller/translation/Translation.js b/extension/controller/translation/Translation.js
@@ -28,7 +28,8 @@ class Translation {
                 {
                     engineLocalPath,
                     engineRemoteRegistry,
-                    modelRegistry
+                    modelRegistry,
+                    isMochitest: this.mediator.isMochitest
                 }
             ])
         }

diff --git a/extension/controller/translation/translationWorker.js b/extension/controller/translation/translationWorker.js
@@ -1,7 +1,9 @@
+/* eslint-disable no-global-assign */
+/* eslint-disable no-native-reassign */
 /* eslint-disable max-lines */
 
-/* global engineRegistryRootURL, engineRegistry, loadEmscriptenGlueCode, Queue */
-/* global modelRegistryRootURL, modelRegistry,importScripts */
+/* global engineRegistryRootURL, engineRegistryRootURLTest, engineRegistry, loadEmscriptenGlueCode, Queue */
+/* global modelRegistryRootURL, modelRegistryRootURLTest, modelRegistry,importScripts */
 
 /*
  * this class should only be instantiated the web worker
@@ -550,6 +552,13 @@ onmessage = function(message) {
             importScripts(message.data[1].engineLocalPath);
             importScripts(message.data[1].engineRemoteRegistry);
             importScripts(message.data[1].modelRegistry);
+            if (message.data[1].isMochitest){
+                // running tests. let's setup the proper tests endpoints
+                // eslint-disable-next-line no-global-assign
+                engineRegistryRootURL = engineRegistryRootURLTest;
+                // eslint-disable-next-line no-global-assign
+                modelRegistryRootURL = modelRegistryRootURLTest;
+            }
             break;
         case "translate":
             translationHelper.requestTranslation(message.data[1]);

diff --git a/extension/mediator.js b/extension/mediator.js
@@ -19,6 +19,11 @@ class Mediator {
         browser.runtime.onMessage.addListener(this.bgScriptsMessageListener.bind(this));
         this.translationBarDisplayed = false;
         this.statsMode = false;
+        // if we are in the protected mochitest page, we flag it.
+        if (window.location.href ===
+            "https://example.com/browser/browser/extensions/translations/test/browser/browser_translation_test.html") {
+            this.isMochitest = true;
+        }
     }
 
     init() {

diff --git a/extension/model/engineRegistry.js b/extension/model/engineRegistry.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-vars */
 
-const engineRegistryRootURL = "https://github.com/mozilla/bergamot-translator/releases/download/0.3.1%2B793d132/";
+let engineRegistryRootURL = "https://github.com/mozilla/bergamot-translator/releases/download/0.3.1%2B793d132/";
+const engineRegistryRootURLTest = "https://example.com/browser/browser/extensions/translations/test/browser/";
 
 const engineRegistry = {
     bergamotTranslatorWasm: {

diff --git a/extension/model/modelRegistry.js b/extension/model/modelRegistry.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable max-lines */
 
-const modelRegistryRootURL = "https://storage.googleapis.com/bergamot-models-sandbox/0.2.10";
+let modelRegistryRootURL = "https://storage.googleapis.com/bergamot-models-sandbox/0.2.10";
+const modelRegistryRootURLTest = "https://example.com/browser/browser/extensions/translations/test/browser";
 
 const modelRegistry = {
   enit: {

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "build": "web-ext build -s extension --overwrite-dest  --no-config-discovery -n firefox_translations.xpi",
     "format": "prettier 'extension/*.{js,css}' --tab-width=2 --arrow-parens=always --trailing-comma=es5 --no-bracket-spacing --write",
     "lint:extension": "web-ext lint -s extension",
-    "once": "web-ext run -s extension --verbose --firefox nightly  --no-config-discovery --pref=extensions.experiments.enabled=true --pref=extensions.translations.disabled=true --pref=javascript.options.wasm_simd_wormhole=true",
+    "once": "web-ext run -s extension --verbose --firefox nightly  --no-config-discovery --pref=extensions.experiments.enabled=true --pref=extensions.translations.disabled=false --pref=javascript.options.wasm_simd_wormhole=true",
     "package": "npm run build && mv web-ext-artifacts/*.zip addon.xpi",
     "setup-webext": "npm install -g web-ext"
   },