mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-04 21:18:35 +00:00
Bug 886263 - Make places be enabled by default in all xpcshell-tests to avoid having to set it in lots of places (so that tests work with apps where places is disabled by default). r=mak
This commit is contained in:
parent
a11663825d
commit
11769462ee
@ -61,8 +61,6 @@ function run_test()
|
|||||||
// Needed to properly setup and shutdown the profile.
|
// Needed to properly setup and shutdown the profile.
|
||||||
do_get_profile();
|
do_get_profile();
|
||||||
|
|
||||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
|
||||||
|
|
||||||
for (var i = 0; i < tests.length; i++)
|
for (var i = 0; i < tests.length; i++)
|
||||||
tests[i]();
|
tests[i]();
|
||||||
|
|
||||||
|
@ -36,6 +36,16 @@ let (ios = Components.classes["@mozilla.org/network/io-service;1"]
|
|||||||
ios.offline = false;
|
ios.offline = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only if building of places is enabled.
|
||||||
|
if ("mozIAsyncHistory" in Components.interfaces) {
|
||||||
|
// Ensure places history is enabled for xpcshell-tests as some non-FF
|
||||||
|
// apps disable it.
|
||||||
|
let (prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIPrefBranch)) {
|
||||||
|
prefs.setBoolPref("places.history.enabled", true);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// Determine if we're running on parent or child
|
// Determine if we're running on parent or child
|
||||||
let runningInParent = true;
|
let runningInParent = true;
|
||||||
try {
|
try {
|
||||||
|
@ -36,9 +36,6 @@ add_task(function test_execute()
|
|||||||
if (!("@mozilla.org/browser/nav-history-service;1" in Cc))
|
if (!("@mozilla.org/browser/nav-history-service;1" in Cc))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Ensure places is enabled.
|
|
||||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
|
||||||
|
|
||||||
let dm = Cc["@mozilla.org/download-manager;1"].
|
let dm = Cc["@mozilla.org/download-manager;1"].
|
||||||
getService(Ci.nsIDownloadManager);
|
getService(Ci.nsIDownloadManager);
|
||||||
let db = dm.DBConnection;
|
let db = dm.DBConnection;
|
||||||
|
@ -55,9 +55,6 @@ function LOG(aMsg) {
|
|||||||
|
|
||||||
let gTestDir = do_get_cwd();
|
let gTestDir = do_get_cwd();
|
||||||
|
|
||||||
// Ensure history is enabled.
|
|
||||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
|
||||||
|
|
||||||
// Initialize profile.
|
// Initialize profile.
|
||||||
let gProfD = do_get_profile();
|
let gProfD = do_get_profile();
|
||||||
|
|
||||||
|
@ -6,9 +6,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
|
|||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
|
|
||||||
// Ensure history is enabled.
|
|
||||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
|
||||||
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
|
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
|
||||||
"resource://gre/modules/commonjs/sdk/core/promise.js");
|
"resource://gre/modules/commonjs/sdk/core/promise.js");
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
|
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
|
||||||
|
@ -733,8 +733,6 @@ let tests = [
|
|||||||
|
|
||||||
function run_test()
|
function run_test()
|
||||||
{
|
{
|
||||||
Services.prefs.setBoolPref("places.history.enabled", true);
|
|
||||||
|
|
||||||
for (let i = 0; i < tests.length; i++)
|
for (let i = 0; i < tests.length; i++)
|
||||||
add_task(tests[i]);
|
add_task(tests[i]);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user