Bug 947854 part 0 - Modify test for bug 885052 to make it more robust. r=dao
authorXidorn Quan <quanxunzhen@gmail.com>
Wed, 06 May 2015 10:04:31 +1200
changeset 242488 373a497c69ca735e9054793c215e97abe54db61b
parent 242487 d96afcb35853ae1f3b934c3b08b5f5932241846c
child 242489 f1cd052c7fb76258b2bf6a9a7a04e206697875ce
push id28697
push usercbook@mozilla.com
push dateWed, 06 May 2015 09:59:51 +0000
treeherdermozilla-central@60349cbc3d4e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs947854, 885052
milestone40.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 947854 part 0 - Modify test for bug 885052 to make it more robust. r=dao
browser/components/customizableui/test/browser_885052_customize_mode_observers_disabed.js
--- a/browser/components/customizableui/test/browser_885052_customize_mode_observers_disabed.js
+++ b/browser/components/customizableui/test/browser_885052_customize_mode_observers_disabed.js
@@ -1,39 +1,45 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
+function isFullscreenSizeMode() {
+  let sizemode = document.documentElement.getAttribute("sizemode");
+  return sizemode == "fullscreen";
+}
+
 // Observers should be disabled when in customization mode.
 add_task(function() {
   // Open and close the panel to make sure that the
   // area is generated before getting a child of the area.
   let shownPanelPromise = promisePanelShown(window);
   PanelUI.toggle({type: "command"});
   yield shownPanelPromise;
   let hiddenPanelPromise = promisePanelHidden(window);
   PanelUI.toggle({type: "command"});
   yield hiddenPanelPromise;
 
   let fullscreenButton = document.getElementById("fullscreen-button");
   ok(!fullscreenButton.checked, "Fullscreen button should not be checked when not in fullscreen.")
+  ok(!isFullscreenSizeMode(), "Should not be in fullscreen sizemode before we enter fullscreen.");
 
   BrowserFullScreen();
-  yield waitForCondition(function() fullscreenButton.checked);
+  yield waitForCondition(() => isFullscreenSizeMode());
   ok(fullscreenButton.checked, "Fullscreen button should be checked when in fullscreen.")
 
   yield startCustomizing();
 
   let fullscreenButtonWrapper = document.getElementById("wrapper-fullscreen-button");
   ok(fullscreenButtonWrapper.hasAttribute("itemobserves"), "Observer should be moved to wrapper");
   fullscreenButton = document.getElementById("fullscreen-button");
   ok(!fullscreenButton.hasAttribute("observes"), "Observer should be removed from button");
   ok(!fullscreenButton.checked, "Fullscreen button should no longer be checked during customization mode");
 
   yield endCustomizing();
 
   BrowserFullScreen();
   fullscreenButton = document.getElementById("fullscreen-button");
-  yield waitForCondition(function() !fullscreenButton.checked);
+  yield waitForCondition(() => !isFullscreenSizeMode());
   ok(!fullscreenButton.checked, "Fullscreen button should not be checked when not in fullscreen.")
 });