[Pkg-mozext-commits] [requestpolicy] 136/280: mozmill: prefs.js has been moved
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:30:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 9f968800d5f5bf11ea8a570db320067b9fca5c53
Author: Martin Kimmerle <dev at 256k.de>
Date: Tue Jan 13 11:39:27 2015 +0100
mozmill: prefs.js has been moved
In the mozmill-tests repository, `prefs.js` has been moved
from `firefox/lib` to `lib/`. See mozmill-tests commit:
http://hg.mozilla.org/qa/mozmill-tests/rev/98fd51ebd0ed
---
.../testLinks/testHTMLAnchorElement/testLinkClick.js | 17 ++++++++++-------
.../testHTMLAnchorElement/testOpenInNewTab.js | 19 +++++++++++--------
.../testHTMLAnchorElement/testOpenInNewWindow.js | 19 +++++++++++--------
.../testTextSelection/testOpenInCurrentTab.js | 17 ++++++++++-------
.../testLinks/testTextSelection/testOpenInNewTab.js | 19 +++++++++++--------
.../testTextSelection/testOpenInNewWindow.js | 19 +++++++++++--------
.../tests/testPolicy/lib/default-policy-iterator.js | 7 +++----
.../testPolicy/testIframeTree/testDefaultPolicies.js | 2 +-
.../testPolicy/testIframeTree/testTemporaryRules.js | 14 +++++++-------
tests/mozmill/tests/testRedirect/testAutoRedirect.js | 17 ++++++++++-------
.../mozmill/tests/testRedirect/testInlineRedirect.js | 17 ++++++++++-------
.../tests/testRedirect/testLinkClickRedirect.js | 17 ++++++++++-------
12 files changed, 105 insertions(+), 79 deletions(-)
diff --git a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
index 299a162..2c13bd0 100644
--- a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
@@ -4,12 +4,15 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -19,11 +22,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
index ae46e59..ef19453 100644
--- a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
@@ -4,13 +4,16 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
-var utils = require("../../../../../../../lib/utils");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+var utils = require(rootDir + "lib/utils");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -21,11 +24,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
utils.closeContentAreaContextMenu(aModule.controller);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
index 9855801..aca023e 100644
--- a/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
@@ -4,13 +4,16 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
-var utils = require("../../../../../../../lib/utils");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+var utils = require(rootDir + "lib/utils");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -23,11 +26,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser.closeAllTabs();
aModule.otherTabBrowser = null;
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
};
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
utils.closeContentAreaContextMenu(aModule.controller);
aModule.tabBrowser.closeAllTabs();
diff --git a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInCurrentTab.js b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInCurrentTab.js
index 39bc337..02fb20d 100644
--- a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInCurrentTab.js
+++ b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInCurrentTab.js
@@ -4,12 +4,15 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -19,11 +22,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewTab.js b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewTab.js
index e8710ef..99bc879 100644
--- a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewTab.js
+++ b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewTab.js
@@ -4,13 +4,16 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
-var utils = require("../../../../../../../lib/utils");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+var utils = require(rootDir + "lib/utils");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -20,11 +23,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
utils.closeContentAreaContextMenu(aModule.controller);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewWindow.js b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewWindow.js
index ef57594..bed62ae 100644
--- a/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewWindow.js
+++ b/tests/mozmill/tests/testLinks/testTextSelection/testOpenInNewWindow.js
@@ -4,13 +4,16 @@
"use strict";
-var {assert, expect} = require("../../../../../../../lib/assertions");
-var prefs = require("../../../../../../lib/prefs");
-var tabs = require("../../../../../../lib/tabs");
-var utils = require("../../../../../../../lib/utils");
+var rpRootDir = "../../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../../lib/rp-utils");
-var rpConst = require("../../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+var utils = require(rootDir + "lib/utils");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
const TEST_URL = "http://www.maindomain.test/link_1.html";
@@ -23,11 +26,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser.closeAllTabs();
aModule.otherTabBrowser = null;
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
};
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
utils.closeContentAreaContextMenu(aModule.controller);
aModule.tabBrowser.closeAllTabs();
diff --git a/tests/mozmill/tests/testPolicy/lib/default-policy-iterator.js b/tests/mozmill/tests/testPolicy/lib/default-policy-iterator.js
index 744dde2..9aa66d5 100644
--- a/tests/mozmill/tests/testPolicy/lib/default-policy-iterator.js
+++ b/tests/mozmill/tests/testPolicy/lib/default-policy-iterator.js
@@ -44,10 +44,9 @@ let DefaultPolicyManager = exports.DefaultPolicyManager = (function() {
if (binaryValue < 0 || binaryValue > maxBinaryValue) {
return false;
} else {
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW,
- isDefaultAllow(binaryValue));
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW_SAME_DOMAIN,
- isInterSubdomainAllowed(binaryValue));
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, isDefaultAllow(binaryValue));
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW_SAME_DOMAIN,
+ isInterSubdomainAllowed(binaryValue));
currentBinaryValue = binaryValue;
return true;
}
diff --git a/tests/mozmill/tests/testPolicy/testIframeTree/testDefaultPolicies.js b/tests/mozmill/tests/testPolicy/testIframeTree/testDefaultPolicies.js
index cf1dd25..bcdc3de 100644
--- a/tests/mozmill/tests/testPolicy/testIframeTree/testDefaultPolicies.js
+++ b/tests/mozmill/tests/testPolicy/testIframeTree/testDefaultPolicies.js
@@ -9,7 +9,7 @@ var rpConst = require(rpRootDir + "lib/constants");
var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
var {assert, expect} = require(rootDir + "lib/assertions");
-var prefs = require(rootDir + "firefox/lib/prefs");
+var prefs = require(rootDir + "lib/prefs");
var tabs = require(rootDir + "firefox/lib/tabs");
var {
diff --git a/tests/mozmill/tests/testPolicy/testIframeTree/testTemporaryRules.js b/tests/mozmill/tests/testPolicy/testIframeTree/testTemporaryRules.js
index f2770fc..8dc73e7 100644
--- a/tests/mozmill/tests/testPolicy/testIframeTree/testTemporaryRules.js
+++ b/tests/mozmill/tests/testPolicy/testIframeTree/testTemporaryRules.js
@@ -9,7 +9,7 @@ var rpConst = require(rpRootDir + "lib/constants");
var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
var {assert, expect} = require(rootDir + "lib/assertions");
-var prefs = require(rootDir + "firefox/lib/prefs");
+var prefs = require(rootDir + "lib/prefs");
var tabs = require(rootDir + "firefox/lib/tabs");
var rpUtils = require(rpRootDir + "lib/rp-utils");
@@ -30,8 +30,8 @@ const TEST_URL = "http://www.maindomain.test/iframe_3.html";
var setupModule = function(aModule) {
- prefs.preferences.setPref(rpConst.PREF_MENU_SHOW_NUM_REQUESTS, true);
- prefs.preferences.setPref(rpConst.PREF_AUTO_RELOAD, false);
+ prefs.setPref(rpConst.PREF_MENU_SHOW_NUM_REQUESTS, true);
+ prefs.setPref(rpConst.PREF_AUTO_RELOAD, false);
aModule.controller = mozmill.getBrowserController();
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
@@ -39,10 +39,10 @@ var setupModule = function(aModule) {
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW_SAME_DOMAIN);
- prefs.preferences.clearUserPref(rpConst.PREF_MENU_SHOW_NUM_REQUESTS);
- prefs.preferences.clearUserPref(rpConst.PREF_AUTO_RELOAD);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW_SAME_DOMAIN);
+ prefs.clearUserPref(rpConst.PREF_MENU_SHOW_NUM_REQUESTS);
+ prefs.clearUserPref(rpConst.PREF_AUTO_RELOAD);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testRedirect/testAutoRedirect.js b/tests/mozmill/tests/testRedirect/testAutoRedirect.js
index ce873c3..f000169 100644
--- a/tests/mozmill/tests/testRedirect/testAutoRedirect.js
+++ b/tests/mozmill/tests/testRedirect/testAutoRedirect.js
@@ -4,12 +4,15 @@
"use strict";
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
+var rpRootDir = "../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../lib/rp-utils");
-var rpConst = require("../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
var testURLPrePath = "http://www.maindomain.test/";
var urlsWithRedirect = [
@@ -35,11 +38,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testRedirect/testInlineRedirect.js b/tests/mozmill/tests/testRedirect/testInlineRedirect.js
index 08c3384..d0e1937 100644
--- a/tests/mozmill/tests/testRedirect/testInlineRedirect.js
+++ b/tests/mozmill/tests/testRedirect/testInlineRedirect.js
@@ -4,12 +4,15 @@
"use strict";
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
+var rpRootDir = "../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../lib/rp-utils");
-var rpConst = require("../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
var testURLPrePath = "http://www.maindomain.test/";
var urlsWithInlineRedirect = [
@@ -22,11 +25,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
aModule.tabBrowser.closeAllTabs();
}
diff --git a/tests/mozmill/tests/testRedirect/testLinkClickRedirect.js b/tests/mozmill/tests/testRedirect/testLinkClickRedirect.js
index ed106a5..0b0021d 100644
--- a/tests/mozmill/tests/testRedirect/testLinkClickRedirect.js
+++ b/tests/mozmill/tests/testRedirect/testLinkClickRedirect.js
@@ -4,12 +4,15 @@
"use strict";
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
+var rpRootDir = "../../";
+var rpConst = require(rpRootDir + "lib/constants");
+var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
-var rpUtils = require("../../lib/rp-utils");
-var rpConst = require("../../lib/constants");
+var {assert, expect} = require(rootDir + "lib/assertions");
+var prefs = require(rootDir + "lib/prefs");
+var tabs = require(rootDir + "firefox/lib/tabs");
+
+var rpUtils = require(rpRootDir + "lib/rp-utils");
var testURLs = [
"http://www.maindomain.test/redirect-js-document-location-link.html",
@@ -22,11 +25,11 @@ var setupModule = function(aModule) {
aModule.tabBrowser = new tabs.tabBrowser(aModule.controller);
aModule.tabBrowser.closeAllTabs();
- prefs.preferences.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
+ prefs.setPref(rpConst.PREF_DEFAULT_ALLOW, false);
}
var teardownModule = function(aModule) {
- prefs.preferences.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
+ prefs.clearUserPref(rpConst.PREF_DEFAULT_ALLOW);
aModule.tabBrowser.closeAllTabs();
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list