Bug 1368920. Part 3 - Use correct constants to identify Nightly and non-Release/Beta in CUI tests. r=Gijs
authorMike Taylor <miket@mozilla.com>
Tue, 06 Jun 2017 15:48:36 -0500
changeset 413695 a2380d694ba088f6112ef52fdd59ab81e09a9673
parent 413694 3ef6dbeeef35d071e10e794f260911b373bd160b
child 413696 0a3b78002ba3b8d0d1fea4b0ee36c16339e4a904
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1368920
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1368920. Part 3 - Use correct constants to identify Nightly and non-Release/Beta in CUI tests. r=Gijs Post Project Dawn, for DevEdition, AppConstants.RELEASE_OR_BETA and AppConstants.MOZ_DEV_EDITION are true. MozReview-Commit-ID: 7aQ4gOsIurT
browser/components/customizableui/test/head.js
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -114,21 +114,21 @@ function resetCustomization() {
   return CustomizableUI.reset();
 }
 
 function isInDevEdition() {
   return AppConstants.MOZ_DEV_EDITION;
 }
 
 function isInNightly() {
-  return AppConstants.NIGHTLY_BUILD && !AppConstants.MOZ_DEV_EDITION;
+  return AppConstants.NIGHTLY_BUILD;
 }
 
 function isNotReleaseOrBeta() {
-  return !AppConstants.RELEASE_OR_BETA;
+  return (isInDevEdition() || isInNightly());
 }
 
 function removeNonReleaseButtons(areaPanelPlacements) {
   if (isInDevEdition() && areaPanelPlacements.includes("developer-button")) {
     areaPanelPlacements.splice(areaPanelPlacements.indexOf("developer-button"), 1);
   }
 }