Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 03:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1560178 - fix/remove about:addons tests that load discovery pane in the parent, r=aswan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D36308

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gijs Kruitbosch 2019-07-12 12:35:20 +00:00
parent 6177d83601
commit 0bd423ac63
2 changed files with 5 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
toolkit/mozapps/extensions/test/browser/browser_discovery.js
View File

@ -212,7 +212,7 @@ function clickLink(aId, aCallback) {
EventUtils.sendMouseEvent({ type: "click" }, link);
executeSoon(function() {
ok(isLoading(), "Clicking a link should show the loading pane");
ok(isLoading(), "Clicking link " + aId + " should show the loading pane");
});
});
if (aCallback) {
@ -350,63 +350,6 @@ add_test(async function() {
close_manager(gManagerWindow, run_next_test);
});
// Tests that navigating to an insecure page fails
add_test(async function() {
let aWindow = await open_manager("addons://discover/");
gManagerWindow = aWindow;
gCategoryUtilities = new CategoryUtilities(gManagerWindow);
var browser = gManagerWindow.document.getElementById("discover-browser");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
await clickLink("link-http");
ok(isError(), "Should have shown the error page");
await gCategoryUtilities.openType("extension");
await gCategoryUtilities.openType("discover");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
close_manager(gManagerWindow, run_next_test);
});
// Tests that navigating to a different domain fails
add_test(async function() {
let aWindow = await open_manager("addons://discover/");
gManagerWindow = aWindow;
gCategoryUtilities = new CategoryUtilities(gManagerWindow);
var browser = gManagerWindow.document.getElementById("discover-browser");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
await clickLink("link-domain");
ok(isError(), "Should have shown the error page");
await gCategoryUtilities.openType("extension");
await gCategoryUtilities.openType("discover");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
close_manager(gManagerWindow, run_next_test);
});
// Tests that navigating to a missing page fails
add_test(async function() {
let aWindow = await open_manager("addons://discover/");
gManagerWindow = aWindow;
gCategoryUtilities = new CategoryUtilities(gManagerWindow);
var browser = gManagerWindow.document.getElementById("discover-browser");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
await clickLink("link-bad");
ok(isError(), "Should have shown the error page");
await gCategoryUtilities.openType("extension");
await gCategoryUtilities.openType("discover");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
close_manager(gManagerWindow, run_next_test);
});
// Tests that navigating to a page on the same domain works
add_test(async function() {
let aWindow = await open_manager("addons://discover/");
@ -430,39 +373,6 @@ add_test(async function() {
close_manager(gManagerWindow, run_next_test);
});
// Tests repeated navigation to the same page followed by a navigation to a
// different domain
add_test(async function() {
let aWindow = await open_manager("addons://discover/");
gManagerWindow = aWindow;
gCategoryUtilities = new CategoryUtilities(gManagerWindow);
var browser = gManagerWindow.document.getElementById("discover-browser");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
var count = 10;
function clickAgain(aCallback) {
if (count-- == 0) {
aCallback();
} else {
clickLink("link-normal", clickAgain.bind(null, aCallback));
}
}
clickAgain(async function() {
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
await clickLink("link-domain");
ok(isError(), "Should have shown the error page");
await gCategoryUtilities.openType("extension");
await gCategoryUtilities.openType("discover");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
close_manager(gManagerWindow, run_next_test);
});
});
// Loading an insecure main page should work if that is what the prefs say, should
// also be able to navigate to a https page and back again
add_test(async function() {
@ -479,16 +389,6 @@ add_test(async function() {
"Should have loaded the right url"
);
await clickLink("link-normal");
is(getURL(browser), MAIN_URL, "Should have loaded the right url");
await clickLink("link-http");
is(
getURL(browser),
TESTROOT + "discovery.html",
"Should have loaded the right url"
);
close_manager(gManagerWindow, run_next_test);
});

4
toolkit/mozapps/extensions/test/browser/browser_webapi_access.js
View File

@ -140,6 +140,10 @@ add_task(async function test_navigated_window() {
// Check that if a page is embedded in a chrome content UI that it can still
// access the API.
add_task(async function test_chrome_frame() {
SpecialPowers.pushPrefEnv({
set: [["security.allow_unsafe_parent_loads", true]],
});
await BrowserTestUtils.withNewTab(
`${CHROMEROOT}webapi_checkchromeframe.xul`,
async function test_available(browser) {