Noissue - Merge current tip to Edge bookmark

qunit/tests/prefs.js

Index: qunit/tests/prefs.js
===================================================================
--- a/qunit/tests/prefs.js
+++ b/qunit/tests/prefs.js
@@ -1,16 +1,25 @@
 "use strict";
 
+(function()
 {
-  module("Preferences",
-  {
+  const {Prefs} = require("prefs");
+
+  module("Preferences", {
     setup()
     {
-      preparePrefs.call(this);
+      this._pbackup = Object.create(null);
+      for (let pref in Prefs)
+      {
+        let value = Prefs[pref];
+        this._pbackup[pref] = value;
+      }
+      Prefs.enabled = true;
     },
 
     teardown()
     {
-      restorePrefs.call(this);
+      for (let pref in this._pbackup)
+        Prefs[pref] = this._pbackup[pref];
     }
   });
 
@@ -39,22 +48,44 @@
   test("Numerical pref", assert =>
   {
     Prefs.patternsbackups = 5;
-    equal(Prefs.patternsbackups, 5, "Prefs object returns the correct value after setting pref to default value");
-    checkPrefExists("patternsbackups", false, "User-defined pref has been removed", assert);
+    equal(
+      Prefs.patternsbackups, 5,
+      "Prefs object returns the correct value after setting pref to " +
+      "default value"
+    );
+    checkPrefExists(
+      "patternsbackups", false, "User-defined pref has been removed", assert
+    );
     Prefs.patternsbackups = 12;
-    equal(Prefs.patternsbackups, 12, "Prefs object returns the correct value after setting pref to non-default value");
-    checkPrefExists("patternsbackups", true, "User-defined pref has been created", assert);
+    equal(
+      Prefs.patternsbackups, 12,
+      "Prefs object returns the correct value after setting pref to " +
+      "non-default value"
+    );
+    checkPrefExists(
+      "patternsbackups", true, "User-defined pref has been created", assert
+    );
     checkPref("patternsbackups", 12, "Value has been written", assert);
   });
 
   test("Boolean pref", assert =>
   {
     Prefs.enabled = true;
-    equal(Prefs.enabled, true, "Prefs object returns the correct value after setting pref to default value");
-    checkPrefExists("enabled", false, "User-defined pref has been removed", assert);
+    equal(
+      Prefs.enabled, true,
+      "Prefs object returns the correct value after setting pref to " +
+      "default value"
+    );
+    checkPrefExists("enabled", false, "User-defined pref has been removed",
+                    assert);
     Prefs.enabled = false;
-    equal(Prefs.enabled, false, "Prefs object returns the correct value after setting pref to non-default value");
-    checkPrefExists("enabled", true, "User-defined pref has been created", assert);
+    equal(
+      Prefs.enabled, false,
+      "Prefs object returns the correct value after setting pref to " +
+      "non-default value"
+    );
+    checkPrefExists("enabled", true, "User-defined pref has been created",
+                    assert);
     checkPref("enabled", false, "Value has been written", assert);
   });
 
@@ -62,25 +93,44 @@
   {
     let defaultValue = "https://notification.adblockplus.org/notification.json";
     Prefs.notificationurl = defaultValue;
-    equal(Prefs.notificationurl, defaultValue, "Prefs object returns the correct value after setting pref to default value");
-    checkPrefExists("notificationurl", false, "User-defined pref has been removed", assert);
+    equal(
+      Prefs.notificationurl, defaultValue,
+      "Prefs object returns the correct value after setting pref to " +
+      "default value"
+    );
+    checkPrefExists("notificationurl", false,
+                    "User-defined pref has been removed", assert);
 
     let newValue = "https://notification.adblockplus.org/foo\u1234bar.json";
     Prefs.notificationurl = newValue;
-    equal(Prefs.notificationurl, newValue, "Prefs object returns the correct value after setting pref to non-default value");
-    checkPrefExists("notificationurl", true, "User-defined pref has been created", assert);
+    equal(
+      Prefs.notificationurl, newValue,
+      "Prefs object returns the correct value after setting pref to " +
+      "non-default value"
+    );
+    checkPrefExists("notificationurl", true,
+                    "User-defined pref has been created", assert);
     checkPref("notificationurl", newValue, "Value has been written", assert);
   });
 
   test("Object pref (complete replacement)", assert =>
   {
     Prefs.notificationdata = {};
-    deepEqual(Prefs.notificationdata, {}, "Prefs object returns the correct value after setting pref to default value");
+    deepEqual(
+      Prefs.notificationdata, {},
+      "Prefs object returns the correct value after setting pref to " +
+      "default value"
+    );
 
-    let newValue = {foo:1, bar: "adsf\u1234"};
+    let newValue = {foo: 1, bar: "adsf\u1234"};
     Prefs.notificationdata = newValue;
-    equal(Prefs.notificationdata, newValue, "Prefs object returns the correct value after setting pref to non-default value");
-    checkPrefExists("notificationdata", true, "User-defined pref has been created", assert);
+    equal(
+      Prefs.notificationdata, newValue,
+      "Prefs object returns the correct value after setting pref to " +
+      "non-default value"
+    );
+    checkPrefExists("notificationdata", true,
+                    "User-defined pref has been created", assert);
     checkPref("notificationdata", newValue, "Value has been written", assert);
   });
 
@@ -91,13 +141,23 @@
     Prefs.notificationdata.foo = 1;
     Prefs.notificationdata.bar = 2;
     Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
-    deepEqual(Prefs.notificationdata, {foo:1, bar: 2}, "Prefs object returns the correct value after setting pref to non-default value");
-    checkPrefExists("notificationdata", true, "User-defined pref has been created", assert);
-    checkPref("notificationdata", {foo:1, bar: 2}, "Value has been written", assert);
+    deepEqual(
+      Prefs.notificationdata, {foo: 1, bar: 2},
+      "Prefs object returns the correct value after setting pref to " +
+      "non-default value"
+    );
+    checkPrefExists("notificationdata", true,
+                    "User-defined pref has been created", assert);
+    checkPref("notificationdata", {foo: 1, bar: 2}, "Value has been written",
+              assert);
 
     delete Prefs.notificationdata.foo;
     delete Prefs.notificationdata.bar;
     Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
-    deepEqual(Prefs.notificationdata, {}, "Prefs object returns the correct value after setting pref to default value");
+    deepEqual(
+      Prefs.notificationdata, {},
+      "Prefs object returns the correct value after setting pref to " +
+      "default value"
+    );
   });
-}
+}());