Bug 490199 - Selected option in new privacy pane not sticky when switching from never remember to customized view; r=rs
authorDrew Willcoxon <adw@mozilla.com>
Sat, 16 May 2009 09:24:28 +0430
changeset 25237 b64bb29046634d7a3644a0fb752d2985dc64d05b
parent 25236 ec47d4d431e83bb25564b2c2aaa9b7c923c373d8
child 25238 9f9d01a3e55da23d7380d6c053f2cbd60b156525
push id1428
push userehsan.akhgari@gmail.com
push dateSat, 16 May 2009 08:04:34 +0000
reviewersrs
bugs490199
milestone1.9.1b5pre
Bug 490199 - Selected option in new privacy pane not sticky when switching from never remember to customized view; r=rs
browser/components/preferences/privacy.js
browser/components/preferences/tests/Makefile.in
browser/components/preferences/tests/browser_privacypane_7.js
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -125,20 +125,22 @@ var gPrivacyPane = {
    * Initialize the history mode menulist based on the privacy preferences
    */
   initializeHistoryMode: function PPP_initializeHistoryMode()
   {
     let mode;
     let getVal = function (aPref)
       document.getElementById(aPref).value;
 
-    if (getVal("browser.privatebrowsing.autostart"))
-      mode = "dontremember";
-    else if (this._checkDefaultValues(this.prefsForDefault))
-      mode = "remember";
+    if (this._checkDefaultValues(this.prefsForDefault)) {
+      if (getVal("browser.privatebrowsing.autostart"))
+        mode = "dontremember";
+      else 
+        mode = "remember";
+    }
     else
       mode = "custom";
 
     document.getElementById("historyMode").value = mode;
   },
 
   /**
    * Update the selected pane based on the history mode menulist
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -47,12 +47,13 @@ include $(topsrcdir)/config/rules.mk
     browser_bug410900.js \
     privacypane_tests.js \
     browser_privacypane_1.js \
     browser_privacypane_2.js \
     browser_privacypane_3.js \
     browser_privacypane_4.js \
     browser_privacypane_5.js \
     browser_privacypane_6.js \
+    browser_privacypane_7.js \
     $(NULL)
 
 libs::	$(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/browser/components/preferences/tests/browser_privacypane_7.js
@@ -0,0 +1,61 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Privacy PrefPane Test.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Drew Willcoxon <adw@mozilla.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+function test() {
+  let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
+               getService(Ci.mozIJSSubScriptLoader);
+  loader.loadSubScript("chrome://mochikit/content/browser/browser/components/preferences/tests/privacypane_tests.js", this);
+
+  run_test_subset([
+    // history mode should be initialized to remember
+    test_historymode_retention("remember", undefined),
+
+    // history mode should remain remember; toggle acceptCookies checkbox
+    test_custom_retention("acceptCookies", "remember"),
+
+    // history mode should now be custom; set history mode to dontremember
+    test_historymode_retention("dontremember", "custom"),
+
+    // history mode should remain custom; set history mode to remember
+    test_historymode_retention("remember", "custom"),
+
+    // history mode should now be remember
+    test_historymode_retention("remember", "remember"),
+
+    // reset all preferences to their default values once we're done
+    reset_preferences
+  ]);
+}