Commit 3081c286 authored by Mike Conley's avatar Mike Conley
Browse files

Bug 1529088 - Hold the HTML-based about:config to Nightly until we get Product...

Bug 1529088 - Hold the HTML-based about:config to Nightly until we get Product sign-off. r=florian,paolo

Differential Revision: https://phabricator.services.mozilla.com/D20825

--HG--
extra : moz-landing-system : lando
parent 03ac7a3a
......@@ -7,7 +7,6 @@
pages = [
'blocked',
'certerror',
'config',
'downloads',
'home',
'library',
......@@ -29,6 +28,9 @@ pages = [
'welcomeback',
]
if defined('NIGHTLY_BUILD'):
pages.append('config')
Classes = [
{
'cid': '{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980}',
......
......@@ -31,7 +31,6 @@ with Files('controlcenter/**'):
DIRS += [
'about',
'aboutconfig',
'attribution',
'contextualidentity',
'customizableui',
......@@ -62,6 +61,7 @@ DIRS += ['build']
if CONFIG['NIGHTLY_BUILD']:
DIRS += [
'aboutconfig',
'payments',
]
......
......@@ -10,6 +10,7 @@ add_task(async function setup() {
await SpecialPowers.pushPrefEnv({
set: [
["browser.aboutConfig.showWarning", false],
["general.warnOnAboutConfig", false],
],
});
});
......@@ -60,8 +61,11 @@ add_task(async function test_set_tabstate_and_duplicate() {
ok(ss.getCustomTabValue(tab, key2) == value2 && tab.linkedBrowser.currentURI.spec == URL,
"the tab's state was correctly restored");
let inputID = AppConstants.NIGHTLY_BUILD ? "about-config-search"
: "textbox";
// add text data
await setInputValue(tab.linkedBrowser, {id: "about-config-search", value: value3});
await setInputValue(tab.linkedBrowser, {id: inputID, value: value3});
// duplicate the tab
let tab2 = ss.duplicateTab(window, tab);
......@@ -71,7 +75,7 @@ add_task(async function test_set_tabstate_and_duplicate() {
ok(ss.getCustomTabValue(tab2, key2) == value2 &&
tab2.linkedBrowser.currentURI.spec == URL,
"correctly duplicated the tab's state");
let textbox = await getInputValue(tab2.linkedBrowser, {id: "about-config-search"});
let textbox = await getInputValue(tab2.linkedBrowser, {id: inputID});
is(textbox, value3, "also duplicated text data");
// clean up
......
......@@ -72,9 +72,7 @@ static const RedirEntry kRedirMap[] = {
{"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
#ifndef MOZ_BUILD_APP_IS_BROWSER
{"config", "chrome://global/content/config.xul", 0},
#endif
#ifdef MOZ_CRASHREPORTER
{"crashes", "chrome://global/content/crashes.xhtml", 0},
#endif
......
......@@ -29,7 +29,7 @@ about_pages = [
'webrtc',
]
if buildconfig.substs['MOZ_BUILD_APP'] != 'browser':
if not defined('NIGHTLY_BUILD') or buildconfig.substs['MOZ_BUILD_APP'] != 'browser':
about_pages.append('config')
if defined('MOZ_CRASHREPORTER'):
about_pages.append('crashes')
......
......@@ -7,9 +7,6 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'Document Navigation')
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
DIRS += [
'base',
'shistory',
......
......@@ -23,9 +23,7 @@ pref("general.useragent.site_specific_overrides", true);
pref("general.config.obscure_value", 13); // for MCD .cfg files
#ifndef MOZ_BUILD_APP_IS_BROWSER
pref("general.warnOnAboutConfig", true);
#endif
// maximum number of dated backups to keep at any time
pref("browser.bookmarks.max_backups", 5);
......
......@@ -49,9 +49,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
if CONFIG['MOZ_ENABLE_WEBRENDER']:
DEFINES['MOZ_ENABLE_WEBRENDER'] = True
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
FINAL_TARGET_PP_FILES += [
'greprefs.js',
]
add_task(async function() {
await BrowserTestUtils.withNewTab({gBrowser, url: "about:config"}, async function(browser) {
await BrowserTestUtils.withNewTab({gBrowser, url: "about:preferences"}, async function(browser) {
let newTabURL = "http://www.example.com/";
await ContentTask.spawn(browser, newTabURL, async function(newTabURL) {
let doc = content.document;
......@@ -7,7 +7,7 @@ add_task(async function() {
label.href = newTabURL;
label.id = "textlink-test";
label.textContent = "click me";
doc.body.prepend(label);
doc.documentElement.append(label);
});
// Test that click will open tab in foreground.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment