Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1048375 - browser_aboutHome.js intermittently causes external requests to snippets.mozilla.com, r=gavin.

Browse Source
This commit is contained in:
Florian Quèze 2014-08-05 01:02:20 +02:00
parent f98d92de79
commit ed17f38980
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/test/general/browser_aboutHome.js
View File

@ -18,7 +18,6 @@ registerCleanupFunction(function() {
Services.prefs.clearUserPref("network.cookie.lifetimePolicy");
Services.prefs.clearUserPref("browser.rights.override");
Services.prefs.clearUserPref("browser.rights." + gRightsVersion + ".shown");
Services.prefs.clearUserPref("browser.aboutHomeSnippets.updateUrl");
});
let gTests = [
@ -216,7 +215,7 @@ let gTests = [
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let rightsData = AboutHomeUtils.knowYourRightsData;
ok(!rightsData, "AboutHomeUtils.knowYourRightsData should be FALSE");
let snippetsElt = doc.getElementById("snippets");
@ -433,9 +432,6 @@ function test()
for (let test of gTests) {
info(test.desc);
// Make sure we don't try to load snippets from the network.
Services.prefs.setCharPref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
if (test.beforeRun)
yield test.beforeRun();
@ -516,7 +512,7 @@ function promiseBrowserAttributes(aTab)
let observer = new MutationObserver(function (mutations) {
for (let mutation of mutations) {
info("Got attribute mutation: " + mutation.attributeName +
" from " + mutation.oldValue);
" from " + mutation.oldValue);
// Now we just have to wait for the last attribute.
if (mutation.attributeName == "searchEngineName") {
info("Remove attributes observer");

10
browser/base/content/test/social/browser_aboutHome_activation.js
View File

@ -11,11 +11,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
XPCOMUtils.defineLazyModuleGetter(this, "AboutHomeUtils",
"resource:///modules/AboutHome.jsm");
registerCleanupFunction(function() {
// Ensure we don't pollute prefs for next tests.
Services.prefs.clearUserPref("browser.aboutHomeSnippets.updateUrl");
});
let snippet =
' <script>' +
' var manifest = {' +
@ -137,9 +132,6 @@ function test()
for (let test of gTests) {
info(test.desc);
// Make sure we don't try to load snippets from the network.
Services.prefs.setCharPref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
// Create a tab to run the test.
let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
@ -282,5 +274,3 @@ function waitForProviderLoad(cb) {
"waitForProviderLoad: provider profile was not set");
}, "social:provider-enabled", false);
}

3
testing/profiles/prefs_general.js
View File

@ -220,5 +220,8 @@ user_pref('apz.test.logging_enabled', true);
user_pref("browser.translation.bing.authURL", "http://%(server)s/browser/browser/components/translation/test/bing.sjs");
user_pref("browser.translation.bing.translateArrayURL", "http://%(server)s/browser/browser/components/translation/test/bing.sjs");
// Make sure we don't try to load snippets from the network.
user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
// Enable debug logging in the mozApps implementation.
user_pref("dom.mozApps.debug", true);