[Pkg-mozext-commits] [compactheader] 249/441: Handle instantApply preference correctly in the mozmill test

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 37479873496bb03a062221192b5253d167d6a6a3
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date:   Sun Aug 7 16:13:19 2011 +0200

    Handle instantApply preference correctly in the mozmill test
    
    --HG--
    branch : preferences
---
 test/compactheader/test-compactheader-preferences.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/compactheader/test-compactheader-preferences.js b/test/compactheader/test-compactheader-preferences.js
index f232925..56c920b 100644
--- a/test/compactheader/test-compactheader-preferences.js
+++ b/test/compactheader/test-compactheader-preferences.js
@@ -57,6 +57,10 @@ const PREF = "browser.preferences.instantApply";
 var prefBranch = Cc["@mozilla.org/preferences-service;1"]
                     .getService(Ci.nsIPrefService).getBranch(null);
 
+var browserPreferences = Components.classes["@mozilla.org/preferences-service;1"]
+    .getService(Components.interfaces.nsIPrefService)
+    .getBranch("browser.preferences.");
+
 var messageBodyISO8859_1 = "ae: " + String.fromCharCode(228) +
   ", oe: " + String.fromCharCode(246) +
   ", ue: " + String.fromCharCode(252) +
@@ -175,9 +179,15 @@ function open_preferences_dialog(aController, aSubtest) {
 }
 
 function close_preferences_dialog(aController) {
-  let okButton = aController.window.document.documentElement.getButton('accept');
   plan_for_window_close(aController);
-  aController.click(new elib.Elem(okButton));
+  if (browserPreferences.getBoolPref("instantApply")) {
+    let cancelButton = aController.window.document.documentElement.getButton('cancel');
+    aController.click(new elib.Elem(cancelButton));
+  }
+  else {
+    let okButton = aController.window.document.documentElement.getButton('accept');
+    aController.click(new elib.Elem(okButton));
+  }
   wait_for_window_close();
   //assert_true(aController.window.closed, "The preferences dialog is not closed.");
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git