Merge pull request #3349 from gijsk/fix-photon-theme-in-tests

Fix tests failing in photon-y Firefox without MOZ_PHOTON_THEME
mozilla-services · Aug 15, 2017 · 4ed2926 · 4ed2926
2 parents 3c2b0a4 + beec56b
commit 4ed2926
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/addon/browser_screenshots_ui_check.js b/test/addon/browser_screenshots_ui_check.js
@@ -13,8 +13,9 @@ add_task(async function() {
     await promiseScreenshotsReset();
   });
 
-  let id = AppConstants.MOZ_PHOTON_THEME ? "pageAction-panel-screenshots"
-                                         : "screenshots_mozilla_org-browser-action";
+  let onPhoton = (typeof AppConstants.MOZ_PHOTON_THEME == "undefined") ||
+                 AppConstants.MOZ_PHOTON_THEME;
+  let id = onPhoton ? "pageAction-panel-screenshots" : "screenshots_mozilla_org-browser-action";
 
   await BrowserTestUtils.waitForCondition(
     () => document.getElementById(id),

diff --git a/test/addon/head.js b/test/addon/head.js
@@ -15,7 +15,7 @@ function promiseScreenshotsEnabled() {
   }
   info("Screenshots is not enabled");
   return new Promise((resolve, reject) => {
-    if (!AppConstants.MOZ_PHOTON_THEME) {
+    if (AppConstants.hasOwnProperty("MOZ_PHOTON_THEME") && !AppConstants.MOZ_PHOTON_THEME) {
       let listener = {
         onWidgetAfterCreation(widgetid) {
           if (widgetid == "screenshots_mozilla_org-browser-action") {
@@ -47,7 +47,7 @@ function promiseScreenshotsDisabled() {
     return Promise.resolve(true);
   }
   return new Promise((resolve, reject) => {
-    if (!AppConstants.MOZ_PHOTON_THEME) {
+    if (AppConstants.hasOwnProperty("MOZ_PHOTON_THEME") && !AppConstants.MOZ_PHOTON_THEME) {
       let listener = {
         onWidgetDestroyed(widgetid) {
           if (widgetid == "screenshots_mozilla_org-browser-action") {