summaryrefslogtreecommitdiffstats
path: root/browser/components/newtab
diff options
context:
space:
mode:
Diffstat (limited to 'browser/components/newtab')
-rw-r--r--browser/components/newtab/tests/browser/.eslintrc.js7
-rw-r--r--browser/components/newtab/tests/browser/blue_page.html9
-rw-r--r--browser/components/newtab/tests/browser/browser.ini16
-rw-r--r--browser/components/newtab/tests/browser/browser_PreviewProvider.js90
-rw-r--r--browser/components/newtab/tests/browser/browser_newtab_overrides.js139
-rw-r--r--browser/components/newtab/tests/browser/browser_newtabmessages.js222
-rw-r--r--browser/components/newtab/tests/browser/browser_newtabwebchannel.js251
-rw-r--r--browser/components/newtab/tests/browser/browser_remotenewtab_pageloads.js52
-rw-r--r--browser/components/newtab/tests/browser/dummy_page.html10
-rw-r--r--browser/components/newtab/tests/browser/newtabmessages_places.html49
-rw-r--r--browser/components/newtab/tests/browser/newtabmessages_prefs.html32
-rw-r--r--browser/components/newtab/tests/browser/newtabmessages_preview.html37
-rw-r--r--browser/components/newtab/tests/browser/newtabmessages_search.html113
-rw-r--r--browser/components/newtab/tests/browser/newtabwebchannel_basic.html36
-rw-r--r--browser/components/newtab/tests/xpcshell/.eslintrc.js7
-rw-r--r--browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js236
-rw-r--r--browser/components/newtab/tests/xpcshell/test_NewTabPrefsProvider.js50
-rw-r--r--browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js82
-rw-r--r--browser/components/newtab/tests/xpcshell/test_NewTabURL.js52
-rw-r--r--browser/components/newtab/tests/xpcshell/test_PlacesProvider.js358
-rw-r--r--browser/components/newtab/tests/xpcshell/xpcshell.ini11
21 files changed, 0 insertions, 1859 deletions
diff --git a/browser/components/newtab/tests/browser/.eslintrc.js b/browser/components/newtab/tests/browser/.eslintrc.js
deleted file mode 100644
index 7c8021192..000000000
--- a/browser/components/newtab/tests/browser/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
- "extends": [
- "../../../../../testing/mochitest/browser.eslintrc.js"
- ]
-};
diff --git a/browser/components/newtab/tests/browser/blue_page.html b/browser/components/newtab/tests/browser/blue_page.html
deleted file mode 100644
index a7f000bfd..000000000
--- a/browser/components/newtab/tests/browser/blue_page.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <meta charset="utf-8">
-</head>
-<body style="background-color: blue">
-</body>
-</html>
diff --git a/browser/components/newtab/tests/browser/browser.ini b/browser/components/newtab/tests/browser/browser.ini
deleted file mode 100644
index fa740be9e..000000000
--- a/browser/components/newtab/tests/browser/browser.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[DEFAULT]
-support-files =
- blue_page.html
- dummy_page.html
- newtabwebchannel_basic.html
- newtabmessages_places.html
- newtabmessages_prefs.html
- newtabmessages_preview.html
- newtabmessages_search.html
-
-[browser_PreviewProvider.js]
-[browser_remotenewtab_pageloads.js]
-[browser_newtab_overrides.js]
-[browser_newtabmessages.js]
-skip-if = true # Bug 1271177, bug 1262719
-[browser_newtabwebchannel.js]
diff --git a/browser/components/newtab/tests/browser/browser_PreviewProvider.js b/browser/components/newtab/tests/browser/browser_PreviewProvider.js
deleted file mode 100644
index b1e3eda9f..000000000
--- a/browser/components/newtab/tests/browser/browser_PreviewProvider.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/* globals XPCOMUtils, Services, PreviewProvider, registerCleanupFunction */
-"use strict";
-
-let Cu = Components.utils;
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PreviewProvider",
- "resource:///modules/PreviewProvider.jsm");
-
-var oldEnabledPref = Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
-Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", false);
-
-registerCleanupFunction(function() {
- while (gBrowser.tabs.length > 1) {
- gBrowser.removeTab(gBrowser.tabs[1]);
- }
- Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", oldEnabledPref);
-});
-
-const TEST_URL = "https://example.com/browser/browser/components/newtab/tests/browser/blue_page.html";
-
-function pixelsForDataURI(dataURI, options) {
- return new Promise(resolve => {
- if (!options) {
- options = {};
- }
- let {width, height} = options;
- if (!width) {
- width = 100;
- }
- if (!height) {
- height = 100;
- }
-
- let htmlns = "http://www.w3.org/1999/xhtml";
- let img = document.createElementNS(htmlns, "img");
- img.setAttribute("src", dataURI);
-
- img.addEventListener("load", function onLoad() {
- img.removeEventListener("load", onLoad, true);
- let canvas = document.createElementNS(htmlns, "canvas");
- canvas.setAttribute("width", width);
- canvas.setAttribute("height", height);
- let ctx = canvas.getContext("2d");
- ctx.drawImage(img, 0, 0, width, height);
- let result = ctx.getImageData(0, 0, width, height).data;
- resolve(result);
- });
- });
-}
-
-function* chunk_four(listData) {
- let index = 0;
- while (index < listData.length) {
- yield listData.slice(index, index + 5);
- index += 4;
- }
-}
-
-add_task(function* open_page() {
- let dataURI = yield PreviewProvider.getThumbnail(TEST_URL);
- let pixels = yield pixelsForDataURI(dataURI, {width: 10, height: 10});
- let rgbCount = {r: 0, g: 0, b: 0, a: 0};
- for (let [r, g, b, a] of chunk_four(pixels)) {
- if (r === 255) {
- rgbCount.r += 1;
- }
- if (g === 255) {
- rgbCount.g += 1;
- }
- if (b === 255) {
- rgbCount.b += 1;
- }
- if (a === 255) {
- rgbCount.a += 1;
- }
- }
- Assert.equal(`${rgbCount.r},${rgbCount.g},${rgbCount.b},${rgbCount.a}`,
- "0,0,100,100", "there should be 100 blue-only pixels at full opacity");
-});
-
-add_task(function* invalid_url() {
- try {
- yield PreviewProvider.getThumbnail("invalid:URL");
- } catch (err) {
- Assert.ok(true, "URL Failed");
- }
-});
diff --git a/browser/components/newtab/tests/browser/browser_newtab_overrides.js b/browser/components/newtab/tests/browser/browser_newtab_overrides.js
deleted file mode 100644
index eab9092a0..000000000
--- a/browser/components/newtab/tests/browser/browser_newtab_overrides.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/* globals
- XPCOMUtils,
- aboutNewTabService,
- Services,
- ContentTask,
- TestUtils,
- BrowserOpenTab,
- registerCleanupFunction,
- is,
- content
-*/
-
-"use strict";
-
-let Cu = Components.utils;
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
- "@mozilla.org/browser/aboutnewtab-service;1",
- "nsIAboutNewTabService");
-
-registerCleanupFunction(function() {
- Services.prefs.setBoolPref("browser.newtabpage.remote", false);
- aboutNewTabService.resetNewTabURL();
-});
-
-/*
- * Tests that the default newtab page is always returned when one types "about:newtab" in the URL bar,
- * even when overridden.
- */
-add_task(function* redirector_ignores_override() {
- let overrides = [
- "chrome://browser/content/downloads/contentAreaDownloadsView.xul",
- "about:home",
- ];
-
- for (let overrideURL of overrides) {
- let notificationPromise = nextChangeNotificationPromise(overrideURL, `newtab page now points to ${overrideURL}`);
- aboutNewTabService.newTabURL = overrideURL;
-
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "url has been overridden");
-
- let tabOptions = {
- gBrowser,
- url: "about:newtab",
- };
-
- /*
- * Simulate typing "about:newtab" in the url bar.
- *
- * Bug 1240169 - We expect the redirector to lead the user to "about:newtab", the default URL,
- * due to invoking AboutRedirector. A user interacting with the chrome otherwise would lead
- * to the overriding URLs.
- */
- yield BrowserTestUtils.withNewTab(tabOptions, function*(browser) {
- yield ContentTask.spawn(browser, {}, function*() {
- Assert.equal(content.location.href, "about:newtab", "Got right URL");
- Assert.equal(content.document.location.href, "about:newtab", "Got right URL");
- Assert.equal(content.document.nodePrincipal,
- Services.scriptSecurityManager.getSystemPrincipal(),
- "nodePrincipal should match systemPrincipal");
- });
- }); // jshint ignore:line
- }
-});
-
-/*
- * Tests loading an overridden newtab page by simulating opening a newtab page from chrome
- */
-add_task(function* override_loads_in_browser() {
- let overrides = [
- "chrome://browser/content/downloads/contentAreaDownloadsView.xul",
- "about:home",
- " about:home",
- ];
-
- for (let overrideURL of overrides) {
- let notificationPromise = nextChangeNotificationPromise(overrideURL.trim(), `newtab page now points to ${overrideURL}`);
- aboutNewTabService.newTabURL = overrideURL;
-
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "url has been overridden");
-
- // simulate a newtab open as a user would
- BrowserOpenTab(); // jshint ignore:line
-
- let browser = gBrowser.selectedBrowser;
- yield BrowserTestUtils.browserLoaded(browser);
-
- yield ContentTask.spawn(browser, {url: overrideURL}, function*(args) {
- Assert.equal(content.location.href, args.url.trim(), "Got right URL");
- Assert.equal(content.document.location.href, args.url.trim(), "Got right URL");
- }); // jshint ignore:line
- yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
- }
-});
-
-/*
- * Tests edge cases when someone overrides the newtabpage with whitespace
- */
-add_task(function* override_blank_loads_in_browser() {
- let overrides = [
- "",
- " ",
- "\n\t",
- " about:blank",
- ];
-
- for (let overrideURL of overrides) {
- let notificationPromise = nextChangeNotificationPromise("about:blank", "newtab page now points to about:blank");
- aboutNewTabService.newTabURL = overrideURL;
-
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "url has been overridden");
-
- // simulate a newtab open as a user would
- BrowserOpenTab(); // jshint ignore:line
-
- let browser = gBrowser.selectedBrowser;
- yield BrowserTestUtils.browserLoaded(browser);
-
- yield ContentTask.spawn(browser, {}, function*() {
- Assert.equal(content.location.href, "about:blank", "Got right URL");
- Assert.equal(content.document.location.href, "about:blank", "Got right URL");
- }); // jshint ignore:line
- yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
- }
-});
-
-function nextChangeNotificationPromise(aNewURL, testMessage) {
- return TestUtils.topicObserved("newtab-url-changed", function observer(aSubject, aData) { // jshint unused:false
- Assert.equal(aData, aNewURL, testMessage);
- return true;
- }.bind(this));
-}
diff --git a/browser/components/newtab/tests/browser/browser_newtabmessages.js b/browser/components/newtab/tests/browser/browser_newtabmessages.js
deleted file mode 100644
index 319ca1c34..000000000
--- a/browser/components/newtab/tests/browser/browser_newtabmessages.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/* globals Cu, XPCOMUtils, Preferences, is, registerCleanupFunction, NewTabWebChannel,
-PlacesTestUtils, NewTabMessages, ok, Services, PlacesUtils, NetUtil, Task */
-
-"use strict";
-
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabWebChannel",
- "resource:///modules/NewTabWebChannel.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabMessages",
- "resource:///modules/NewTabMessages.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
- "resource://testing-common/PlacesTestUtils.jsm");
-
-let setup = Task.async(function*() {
- Preferences.set("browser.newtabpage.enhanced", true);
- Preferences.set("browser.newtabpage.remote.mode", "test");
- Preferences.set("browser.newtabpage.remote", true);
- NewTabMessages.init();
- yield PlacesTestUtils.clearHistory();
-});
-
-let cleanup = Task.async(function*() {
- NewTabMessages.uninit();
- Preferences.set("browser.newtabpage.remote", false);
- Preferences.set("browser.newtabpage.remote.mode", "production");
-});
-registerCleanupFunction(cleanup);
-
-/*
- * Sanity tests for pref messages
- */
-add_task(function* prefMessages_request() {
- yield setup();
-
- let testURL = "https://example.com/browser/browser/components/newtab/tests/browser/newtabmessages_prefs.html";
-
- let tabOptions = {
- gBrowser,
- url: testURL
- };
-
- let prefResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("responseAck", () => {
- ok(true, "a request response has been received");
- resolve();
- });
- });
-
- yield BrowserTestUtils.withNewTab(tabOptions, function*() {
- yield prefResponseAck;
- let prefChangeAck = new Promise(resolve => {
- NewTabWebChannel.once("responseAck", () => {
- ok(true, "a change response has been received");
- resolve();
- });
- });
- Preferences.set("browser.newtabpage.enhanced", false);
- yield prefChangeAck;
- });
- yield cleanup();
-});
-
-/*
- * Sanity tests for preview messages
- */
-add_task(function* previewMessages_request() {
- yield setup();
- var oldEnabledPref = Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
- Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", false);
-
- let testURL = "https://example.com/browser/browser/components/newtab/tests/browser/newtabmessages_preview.html";
-
- let tabOptions = {
- gBrowser,
- url: testURL
- };
-
- let previewResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("responseAck", () => {
- ok(true, "a request response has been received");
- resolve();
- });
- });
-
- yield BrowserTestUtils.withNewTab(tabOptions, function*() {
- yield previewResponseAck;
- });
- yield cleanup();
- Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", oldEnabledPref);
-});
-
-/*
- * Sanity tests for places messages
- */
-add_task(function* placesMessages_request() {
- yield setup();
- let testURL = "https://example.com/browser/browser/components/newtab/tests/browser/newtabmessages_places.html";
-
- // url prefix for test history population
- const TEST_URL = "https://mozilla.com/";
- // time when the test starts execution
- const TIME_NOW = (new Date()).getTime();
-
- // utility function to compute past timestamp
- function timeDaysAgo(numDays) {
- return TIME_NOW - (numDays * 24 * 60 * 60 * 1000);
- }
-
- // utility function to make a visit for insertion into places db
- function makeVisit(index, daysAgo, isTyped, domain=TEST_URL) {
- let {
- TRANSITION_TYPED,
- TRANSITION_LINK
- } = PlacesUtils.history;
-
- return {
- uri: NetUtil.newURI(`${domain}${index}`),
- visitDate: timeDaysAgo(daysAgo),
- transition: (isTyped) ? TRANSITION_TYPED : TRANSITION_LINK,
- };
- }
-
- yield PlacesTestUtils.clearHistory();
-
- // all four visits must come from different domains to avoid deduplication
- let visits = [
- makeVisit(0, 0, true, "http://bar.com/"), // frecency 200, today
- makeVisit(1, 0, true, "http://foo.com/"), // frecency 200, today
- makeVisit(2, 2, true, "http://buz.com/"), // frecency 200, 2 days ago
- makeVisit(3, 2, false, "http://aaa.com/"), // frecency 10, 2 days ago, transition
- ];
-
- yield PlacesTestUtils.addVisits(visits);
-
- /** Test Begins **/
-
- let tabOptions = {
- gBrowser,
- url: testURL
- };
-
- let placesResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("numItemsAck", (_, msg) => {
- ok(true, "a request response has been received");
- is(msg.data, visits.length + 1, "received an expected number of history items");
- resolve();
- });
- });
-
- yield BrowserTestUtils.withNewTab(tabOptions, function*() {
- yield placesResponseAck;
- ok(true, "a change response has been received");
- let placesChangeAck = new Promise(resolve => {
- NewTabWebChannel.once("clearHistoryAck", (_, msg) => {
- is(msg.data, "clearHistory", "a clear history message has been received");
- resolve();
- });
- });
- yield PlacesTestUtils.clearHistory();
- yield placesChangeAck;
- });
- yield cleanup();
-});
-
-/*
- * Sanity tests for search messages
- */
-add_task(function* searchMessages_request() {
- yield setup();
- let testURL = "https://example.com/browser/browser/components/newtab/tests/browser/newtabmessages_search.html";
-
- // create dummy test engines
- Services.search.addEngineWithDetails("Engine1", "", "", "", "GET",
- "http://example.com/?q={searchTerms}");
- Services.search.addEngineWithDetails("Engine2", "", "", "", "GET",
- "http://example.com/?q={searchTerms}");
-
- let tabOptions = {
- gBrowser,
- url: testURL
- };
-
- let UIStringsResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("UIStringsAck", (_, msg) => {
- ok(true, "a search request response for UI string has been received");
- ok(msg.data, "received the UI Strings");
- resolve();
- });
- });
- let suggestionsResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("suggestionsAck", (_, msg) => {
- ok(true, "a search request response for suggestions has been received");
- ok(msg.data, "received the suggestions");
- resolve();
- });
- });
- let stateResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("stateAck", (_, msg) => {
- ok(true, "a search request response for state has been received");
- ok(msg.data, "received a state object");
- resolve();
- });
- });
- let currentEngineResponseAck = new Promise(resolve => {
- NewTabWebChannel.once("currentEngineAck", (_, msg) => {
- ok(true, "a search request response for current engine has been received");
- ok(msg.data, "received a current engine");
- resolve();
- });
- });
-
- yield BrowserTestUtils.withNewTab(tabOptions, function*() {
- yield UIStringsResponseAck;
- yield suggestionsResponseAck;
- yield stateResponseAck;
- yield currentEngineResponseAck;
- });
-
- cleanup();
-});
diff --git a/browser/components/newtab/tests/browser/browser_newtabwebchannel.js b/browser/components/newtab/tests/browser/browser_newtabwebchannel.js
deleted file mode 100644
index f003b105b..000000000
--- a/browser/components/newtab/tests/browser/browser_newtabwebchannel.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/* globals XPCOMUtils, Cu, Preferences, NewTabWebChannel, is, registerCleanupFunction */
-
-"use strict";
-
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabWebChannel",
- "resource:///modules/NewTabWebChannel.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabMessages",
- "resource:///modules/NewTabMessages.jsm");
-
-const TEST_URL = "https://example.com/browser/browser/components/newtab/tests/browser/newtabwebchannel_basic.html";
-const TEST_URL_2 = "http://mochi.test:8888/browser/browser/components/newtab/tests/browser/newtabwebchannel_basic.html";
-
-function setup(mode = "test") {
- Preferences.set("browser.newtabpage.remote.mode", mode);
- Preferences.set("browser.newtabpage.remote", true);
- NewTabWebChannel.init();
- NewTabMessages.init();
-}
-
-function cleanup() {
- NewTabMessages.uninit();
- NewTabWebChannel.uninit();
- Preferences.set("browser.newtabpage.remote", false);
- Preferences.set("browser.newtabpage.remote.mode", "production");
-}
-registerCleanupFunction(cleanup);
-
-/*
- * Tests flow of messages from newtab to chrome and chrome to newtab
- */
-add_task(function* open_webchannel_basic() {
- setup();
-
- let tabOptions = {
- gBrowser,
- url: TEST_URL
- };
-
- let messagePromise = new Promise(resolve => {
- NewTabWebChannel.once("foo", function(name, msg) {
- is(name, "foo", "Correct message type sent: foo");
- is(msg.data, "bar", "Correct data sent: bar");
- resolve(msg.target);
- });
- });
-
- let replyPromise = new Promise(resolve => {
- NewTabWebChannel.once("reply", function(name, msg) {
- is(name, "reply", "Correct message type sent: reply");
- is(msg.data, "quuz", "Correct data sent: quuz");
- resolve(msg.target);
- });
- });
-
- let unloadPromise = new Promise(resolve => {
- NewTabWebChannel.once("targetUnload", function(name) {
- is(name, "targetUnload", "Correct message type sent: targetUnload");
- resolve();
- });
- });
-
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield BrowserTestUtils.withNewTab(tabOptions, function*(browser) {
- let target = yield messagePromise;
- is(NewTabWebChannel.numBrowsers, 1, "One target expected");
- is(target.browser, browser, "Same browser");
- NewTabWebChannel.send("respond", null, target);
- yield replyPromise;
- });
-
- Cu.forceGC();
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield unloadPromise;
- cleanup();
-});
-
-/*
- * Tests message broadcast reaches all open newtab pages
- */
-add_task(function* webchannel_broadcast() {
- setup();
-
- let countingMessagePromise = new Promise(resolve => {
- let count = 0;
- NewTabWebChannel.on("foo", function test_message(name, msg) {
- count += 1;
- if (count === 2) {
- NewTabWebChannel.off("foo", test_message);
- resolve(msg.target);
- }
- }.bind(this));
- });
-
- let countingReplyPromise = new Promise(resolve => {
- let count = 0;
- NewTabWebChannel.on("reply", function test_message(name, msg) {
- count += 1;
- if (count === 2) {
- NewTabWebChannel.off("reply", test_message);
- resolve(msg.target);
- }
- }.bind(this));
- });
-
- let countingUnloadPromise = new Promise(resolve => {
- let count = 0;
- NewTabWebChannel.on("targetUnload", function test_message() {
- count += 1;
- if (count === 2) {
- NewTabWebChannel.off("targetUnload", test_message);
- resolve();
- }
- });
- });
-
- let tabs = [];
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- tabs.push(yield BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL));
- tabs.push(yield BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL));
-
- yield countingMessagePromise;
- is(NewTabWebChannel.numBrowsers, 2, "Two targets expected");
-
- NewTabWebChannel.broadcast("respond", null);
- yield countingReplyPromise;
-
- for (let tab of tabs) {
- yield BrowserTestUtils.removeTab(tab);
- }
- Cu.forceGC();
-
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield countingUnloadPromise;
- cleanup();
-});
-
-/*
- * Tests switching modes
- */
-add_task(function* webchannel_switch() {
- setup();
-
- function newMessagePromise() {
- return new Promise(resolve => {
- NewTabWebChannel.once("foo", function(name, msg) {
- resolve(msg.target);
- }.bind(this));
- });
- }
-
- let replyCount = 0;
- function newReplyPromise() {
- return new Promise(resolve => {
- NewTabWebChannel.on("reply", function() {
- replyCount += 1;
- resolve();
- });
- });
- }
-
- let unloadPromise = new Promise(resolve => {
- NewTabWebChannel.once("targetUnload", function() {
- resolve();
- });
- });
-
- let unloadAllPromise = new Promise(resolve => {
- NewTabWebChannel.once("targetUnloadAll", function() {
- resolve();
- });
- });
-
- let tabs = [];
- let messagePromise;
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
-
- messagePromise = newMessagePromise();
- tabs.push(yield BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL));
- yield messagePromise;
- is(NewTabWebChannel.numBrowsers, 1, "Correct number of targets");
-
- messagePromise = newMessagePromise();
- Preferences.set("browser.newtabpage.remote.mode", "test2");
- tabs.push(yield BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL_2));
- yield unloadAllPromise;
- yield messagePromise;
- is(NewTabWebChannel.numBrowsers, 1, "Correct number of targets");
-
- NewTabWebChannel.broadcast("respond", null);
- yield newReplyPromise();
- is(replyCount, 1, "only current channel is listened to for replies");
-
- const webchannelWhitelistPref = "webchannel.allowObject.urlWhitelist";
- let origWhitelist = Services.prefs.getCharPref(webchannelWhitelistPref);
- let newWhitelist = origWhitelist + " http://mochi.test:8888";
- Services.prefs.setCharPref(webchannelWhitelistPref, newWhitelist);
- try {
- NewTabWebChannel.broadcast("respond_object", null);
- yield newReplyPromise();
- } finally {
- Services.prefs.clearUserPref(webchannelWhitelistPref);
- }
-
- for (let tab of tabs) {
- yield BrowserTestUtils.removeTab(tab);
- }
-
- Cu.forceGC();
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield unloadPromise;
- cleanup();
-});
-
-add_task(function* open_webchannel_reload() {
- setup();
-
- let tabOptions = {
- gBrowser,
- url: TEST_URL
- };
-
- let messagePromise = new Promise(resolve => {
- NewTabWebChannel.once("foo", function(name, msg) {
- is(name, "foo", "Correct message type sent: foo");
- is(msg.data, "bar", "Correct data sent: bar");
- resolve(msg.target);
- });
- });
- let unloadPromise = new Promise(resolve => {
- NewTabWebChannel.once("targetUnload", function() {
- resolve();
- });
- });
-
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield BrowserTestUtils.withNewTab(tabOptions, function*(browser) {
- let target = yield messagePromise;
- is(NewTabWebChannel.numBrowsers, 1, "One target expected");
- is(target.browser, browser, "Same browser");
-
- browser.reload();
- });
-
- Cu.forceGC();
- is(NewTabWebChannel.numBrowsers, 0, "Sanity check");
- yield unloadPromise;
- cleanup();
-});
diff --git a/browser/components/newtab/tests/browser/browser_remotenewtab_pageloads.js b/browser/components/newtab/tests/browser/browser_remotenewtab_pageloads.js
deleted file mode 100644
index e99aeffc2..000000000
--- a/browser/components/newtab/tests/browser/browser_remotenewtab_pageloads.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* globals Cu, XPCOMUtils, TestUtils, aboutNewTabService, ContentTask, content, is */
-"use strict";
-
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
- "@mozilla.org/browser/aboutnewtab-service;1",
- "nsIAboutNewTabService");
-
-const TEST_URL = "https://example.com/browser/browser/components/newtab/tests/browser/dummy_page.html";
-
-/*
- * Tests opening a newtab page with a remote URL. Simulates a newtab open from chrome
- */
-add_task(function* open_newtab() {
- let notificationPromise = nextChangeNotificationPromise(TEST_URL, "newtab page now points to test url");
- aboutNewTabService.newTabURL = TEST_URL;
-
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "url has been overridden");
-
- /*
- * Simulate a newtab open as a user would.
- *
- * Bug 1240169 - We cannot set the URL to about:newtab because that would invoke the redirector.
- * The redirector always yields the loading of a default newtab URL. We expect the user to use
- * the browser UI to access overriding URLs, for istance by click on the "+" button in the tab
- * bar, or by using the new tab shortcut key.
- */
- BrowserOpenTab(); // jshint ignore:line
-
- let browser = gBrowser.selectedBrowser;
- yield BrowserTestUtils.browserLoaded(browser);
-
- yield ContentTask.spawn(browser, {url: TEST_URL}, function*(args) {
- Assert.equal(content.document.location.href, args.url,
- "document.location should match the external resource");
- Assert.equal(content.document.documentURI, args.url,
- "document.documentURI should match the external resource");
- Assert.equal(content.document.nodePrincipal.URI.spec, args.url,
- "nodePrincipal should match the external resource");
- });
- yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
-function nextChangeNotificationPromise(aNewURL, testMessage) {
- return TestUtils.topicObserved("newtab-url-changed", function observer(aSubject, aData) { // jshint unused:false
- Assert.equal(aData, aNewURL, testMessage);
- return true;
- }.bind(this));
-}
diff --git a/browser/components/newtab/tests/browser/dummy_page.html b/browser/components/newtab/tests/browser/dummy_page.html
deleted file mode 100644
index 4b0689bde..000000000
--- a/browser/components/newtab/tests/browser/dummy_page.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <meta charset="utf-8">
-</head>
-<body>
-<p>Dummy Page</p>
-</body>
-</html>
diff --git a/browser/components/newtab/tests/browser/newtabmessages_places.html b/browser/components/newtab/tests/browser/newtabmessages_places.html
deleted file mode 100644
index e89bc4a22..000000000
--- a/browser/components/newtab/tests/browser/newtabmessages_places.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
- <head>
- <meta charset="utf8">
- <title>Newtab WebChannel test</title>
- </head>
- <body>
- <script>
- window.addEventListener("WebChannelMessageToContent", function(e) {
- if (e.detail.message) {
- let reply;
- switch (e.detail.message.type) {
- case "RECEIVE_FRECENT":
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "numItemsAck", data: e.detail.message.data.length}),
- })
- });
- window.dispatchEvent(reply);
- break;
- case "RECEIVE_PLACES_CHANGE":
- if (e.detail.message.data.type === "clearHistory") {
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "clearHistoryAck", data: e.detail.message.data.type}),
- })
- });
- window.dispatchEvent(reply);
- }
- break;
- }
- }
- }, true);
-
- document.onreadystatechange = function () {
- if (document.readyState === "complete") {
- let msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_FRECENT"}),
- })
- });
- window.dispatchEvent(msg);
- }
- }
- </script>
- </body>
-</html>
diff --git a/browser/components/newtab/tests/browser/newtabmessages_prefs.html b/browser/components/newtab/tests/browser/newtabmessages_prefs.html
deleted file mode 100644
index 9b38af4b9..000000000
--- a/browser/components/newtab/tests/browser/newtabmessages_prefs.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
- <head>
- <meta charset="utf8">
- <title>Newtab WebChannel test</title>
- </head>
- <body>
- <script>
- window.addEventListener("WebChannelMessageToContent", function(e) {
- if (e.detail.message && e.detail.message.type === "RECEIVE_PREFS") {
- let reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "responseAck"}),
- })
- });
- window.dispatchEvent(reply);
- }
- }, true);
-
- document.onreadystatechange = function () {
- let msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_PREFS"}),
- })
- });
- window.dispatchEvent(msg);
- };
-
- </script>
- </body>
-</html>
diff --git a/browser/components/newtab/tests/browser/newtabmessages_preview.html b/browser/components/newtab/tests/browser/newtabmessages_preview.html
deleted file mode 100644
index 4fe55132d..000000000
--- a/browser/components/newtab/tests/browser/newtabmessages_preview.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
- <head>
- <meta charset="utf8">
- <title>Newtab WebChannel test</title>
- </head>
- <body>
- <script>
- let thumbURL = "https://example.com/browser/browser/components/newtab/tests/browser/blue_page.html";
-
- window.addEventListener("WebChannelMessageToContent", function(e) {
- if (e.detail.message && e.detail.message.type === "RECEIVE_THUMB") {
- if (e.detail.message.data.imgData && e.detail.message.data.url === thumbURL) {
- let reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "responseAck"}),
- })
- });
- window.dispatchEvent(reply);
- }
- }
- }, true);
-
- document.onreadystatechange = function () {
- if (document.readyState === "complete") {
- let msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_THUMB", data: thumbURL}),
- })
- });
- window.dispatchEvent(msg);
- }
- };
- </script>
- </body>
-</html>
diff --git a/browser/components/newtab/tests/browser/newtabmessages_search.html b/browser/components/newtab/tests/browser/newtabmessages_search.html
deleted file mode 100644
index b8b21c42a..000000000
--- a/browser/components/newtab/tests/browser/newtabmessages_search.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<html>
- <head>
- <meta charset="utf8">
- <title>Newtab WebChannel test</title>
- </head>
- <body>
- <script>
- let suggestionsData = {
- engineName: "Engine1",
- searchString: "test",
- };
- let removeFormHistoryData = "test";
- let performSearchData = {
- engineName: "Engine1",
- healthReportKey: "1",
- searchPurpose: "d",
- searchString: "test",
- };
- let cycleEngineData = "Engine2";
-
- window.addEventListener("WebChannelMessageToContent", function(e) {
- if (e.detail.message) {
- let reply;
- switch (e.detail.message.type) {
- case "RECEIVE_UISTRINGS":
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "UIStringsAck", data: e.detail.message.data}),
- }
- });
- window.dispatchEvent(reply);
- break;
- case "RECEIVE_SEARCH_SUGGESTIONS":
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "suggestionsAck", data: e.detail.message.data}),
- }
- });
- window.dispatchEvent(reply);
- break;
- case "RECEIVE_SEARCH_STATE":
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "stateAck", data: e.detail.message.data}),
- }
- });
- window.dispatchEvent(reply);
- break;
- case "RECEIVE_CURRENT_ENGINE":
- reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "currentEngineAck", data: e.detail.message.data}),
- }
- });
- window.dispatchEvent(reply);
- break;
- }
- }
- }, true);
-
- document.onreadystatechange = function () {
- if (document.readyState === "complete") {
- let msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_UISTRINGS"}),
- }
- });
- window.dispatchEvent(msg);
- msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_SEARCH_SUGGESTIONS", data: suggestionsData}),
- }
- });
- window.dispatchEvent(msg);
- msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_SEARCH_STATE"}),
- }
- });
- window.dispatchEvent(msg);
- msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_REMOVE_FORM_HISTORY", data: removeFormHistoryData}),
- }
- });
- window.dispatchEvent(msg);
- msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_PERFORM_SEARCH", data: performSearchData}),
- }
- });
- window.dispatchEvent(msg);
- msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: {
- id: "newtab",
- message: JSON.stringify({type: "REQUEST_CYCLE_ENGINE", data: cycleEngineData}),
- }
- });
- window.dispatchEvent(msg);
- }
- }
- </script>
- </body>
-</html>
diff --git a/browser/components/newtab/tests/browser/newtabwebchannel_basic.html b/browser/components/newtab/tests/browser/newtabwebchannel_basic.html
deleted file mode 100644
index 7f3c79920..000000000
--- a/browser/components/newtab/tests/browser/newtabwebchannel_basic.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
- <head>
- <meta charset="utf8">
- <title>Newtab WebChannel test</title>
- </head>
- <body>
- <script>
- document.onreadystatechange = function () {
- let msg = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: JSON.stringify({
- id: "newtab",
- message: JSON.stringify({type: "foo", data: "bar"}),
- })
- });
- window.dispatchEvent(msg);
- };
-
- window.addEventListener("WebChannelMessageToContent", function(e) {
- if (e.detail.message && e.detail.message.type.startsWith("respond")) {
- var detail = {
- id: "newtab",
- message: JSON.stringify({type: "reply", data: "quuz"}),
- };
- if (e.detail.message.type !== "respond_object") {
- detail = JSON.stringify(detail);
- }
- let reply = new window.CustomEvent("WebChannelMessageToChrome", {
- detail: detail
- });
- window.dispatchEvent(reply);
- }
- }, true);
-
- </script>
- </body>
-</html>
diff --git a/browser/components/newtab/tests/xpcshell/.eslintrc.js b/browser/components/newtab/tests/xpcshell/.eslintrc.js
deleted file mode 100644
index d35787cd2..000000000
--- a/browser/components/newtab/tests/xpcshell/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
- "extends": [
- "../../../../../testing/xpcshell/xpcshell.eslintrc.js"
- ]
-};
diff --git a/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js b/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
deleted file mode 100644
index 21f68ab70..000000000
--- a/browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/* globals Services, XPCOMUtils, NewTabPrefsProvider, Preferences, aboutNewTabService, do_register_cleanup */
-
-"use strict";
-
-const {utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabPrefsProvider",
- "resource:///modules/NewTabPrefsProvider.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
- "@mozilla.org/browser/aboutnewtab-service;1",
- "nsIAboutNewTabService");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Locale",
- "resource://gre/modules/Locale.jsm");
-
-const DEFAULT_HREF = aboutNewTabService.generateRemoteURL();
-const DEFAULT_CHROME_URL = "chrome://browser/content/newtab/newTab.xhtml";
-const DOWNLOADS_URL = "chrome://browser/content/downloads/contentAreaDownloadsView.xul";
-const DEFAULT_VERSION = aboutNewTabService.remoteVersion;
-
-function cleanup() {
- Services.prefs.setBoolPref("browser.newtabpage.remote", false);
- Services.prefs.setCharPref("browser.newtabpage.remote.version", DEFAULT_VERSION);
- aboutNewTabService.resetNewTabURL();
- NewTabPrefsProvider.prefs.uninit();
-}
-
-do_register_cleanup(cleanup);
-
-/**
- * Test the overriding of the default URL
- */
-add_task(function* test_override_remote_disabled() {
- NewTabPrefsProvider.prefs.init();
- let notificationPromise;
- Services.prefs.setBoolPref("browser.newtabpage.remote", false);
-
- // tests default is the local newtab resource
- Assert.equal(aboutNewTabService.defaultURL, DEFAULT_CHROME_URL,
- `Default newtab URL should be ${DEFAULT_CHROME_URL}`);
-
- // override with some remote URL
- let url = "http://example.com/";
- notificationPromise = nextChangeNotificationPromise(url);
- aboutNewTabService.newTabURL = url;
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "Newtab URL should be overridden");
- Assert.ok(!aboutNewTabService.remoteEnabled, "Newtab remote should not be enabled");
- Assert.equal(aboutNewTabService.newTabURL, url, "Newtab URL should be the custom URL");
-
- // test reset with remote disabled
- notificationPromise = nextChangeNotificationPromise("about:newtab");
- aboutNewTabService.resetNewTabURL();
- yield notificationPromise;
- Assert.ok(!aboutNewTabService.overridden, "Newtab URL should not be overridden");
- Assert.equal(aboutNewTabService.newTabURL, "about:newtab", "Newtab URL should be the default");
-
- // test override to a chrome URL
- notificationPromise = nextChangeNotificationPromise(DOWNLOADS_URL);
- aboutNewTabService.newTabURL = DOWNLOADS_URL;
- yield notificationPromise;
- Assert.ok(aboutNewTabService.overridden, "Newtab URL should be overridden");
- Assert.equal(aboutNewTabService.newTabURL, DOWNLOADS_URL, "Newtab URL should be the custom URL");
-
- cleanup();
-});
-
-add_task(function* test_override_remote_enabled() {
- NewTabPrefsProvider.prefs.init();
- let notificationPromise;
- // change newtab page to remote
- notificationPromise = nextChangeNotificationPromise("about:newtab");
- Services.prefs.setBoolPref("browser.newtabpage.remote", true);
- yield notificationPromise;
- let remoteHref = aboutNewTabService.generateRemoteURL();
- Assert.equal(aboutNewTabService.defaultURL, remoteHref, "Newtab URL should be the default remote URL");
- Assert.ok(!aboutNewTabService.overridden, "Newtab URL should not be overridden");
- Assert.ok(aboutNewTabService.remoteEnabled, "Newtab remote should be enabled");
-
- // change to local newtab page while remote is enabled
- notificationPromise = nextChangeNotificationPromise(DEFAULT_CHROME_URL);
- aboutNewTabService.newTabURL = DEFAULT_CHROME_URL;
- yield notificationPromise;
- Assert.equal(aboutNewTabService.newTabURL, DEFAULT_CHROME_URL,
- "Newtab URL set to chrome url");
- Assert.equal(aboutNewTabService.defaultURL, DEFAULT_CHROME_URL,
- "Newtab URL defaultURL set to the default chrome URL");
- Assert.ok(aboutNewTabService.overridden, "Newtab URL should be overridden");
- Assert.ok(!aboutNewTabService.remoteEnabled, "Newtab remote should not be enabled");
-
- cleanup();
-});
-
-/**
- * Tests reponse to updates to prefs
- */
-add_task(function* test_updates() {
- /*
- * Simulates a "cold-boot" situation, with some pref already set before testing a series
- * of changes.
- */
- Preferences.set("browser.newtabpage.remote", true);
- aboutNewTabService.resetNewTabURL(); // need to set manually because pref notifs are off
- let notificationPromise;
- let productionModeBaseUrl = "https://content.cdn.mozilla.net";
- let testModeBaseUrl = "https://example.com";
- let expectedPath = `/newtab` +
- `/v${aboutNewTabService.remoteVersion}` +
- `/${aboutNewTabService.remoteReleaseName}` +
- "/en-GB" +
- "/index.html";
- let expectedHref = productionModeBaseUrl + expectedPath;
- Preferences.set("intl.locale.matchOS", true);
- Preferences.set("general.useragent.locale", "en-GB");
- Preferences.set("browser.newtabpage.remote.mode", "production");
- NewTabPrefsProvider.prefs.init();
-
- // test update checks for prefs
- notificationPromise = nextChangeNotificationPromise(
- expectedHref, "Remote href should be updated");
- Preferences.set("intl.locale.matchOS", false);
- yield notificationPromise;
-
- notificationPromise = nextChangeNotificationPromise(
- DEFAULT_HREF, "Remote href changes back to default");
- Preferences.set("general.useragent.locale", "en-US");
- yield notificationPromise;
-
- // test update fires when mode is changed
- expectedPath = expectedPath.replace("/en-GB/", "/en-US/");
- notificationPromise = nextChangeNotificationPromise(
- testModeBaseUrl + expectedPath, "Remote href changes back to origin of test mode");
- Preferences.set("browser.newtabpage.remote.mode", "test");
- yield notificationPromise;
-
- // test invalid mode ends up pointing to production url
- notificationPromise = nextChangeNotificationPromise(
- DEFAULT_HREF, "Remote href changes back to production default");
- Preferences.set("browser.newtabpage.remote.mode", "invalid");
- yield notificationPromise;
-
- // test update fires on override and reset
- let testURL = "https://example.com/";
- notificationPromise = nextChangeNotificationPromise(
- testURL, "a notification occurs on override");
- aboutNewTabService.newTabURL = testURL;
- yield notificationPromise;
-
- // from overridden to default
- notificationPromise = nextChangeNotificationPromise(
- "about:newtab", "a notification occurs on reset");
- aboutNewTabService.resetNewTabURL();
- Assert.ok(aboutNewTabService.remoteEnabled, "Newtab remote should be enabled");
- Assert.equal(aboutNewTabService.defaultURL, DEFAULT_HREF, "Default URL should be the remote page");
- yield notificationPromise;
-
- // override to default URL from default URL
- notificationPromise = nextChangeNotificationPromise(
- testURL, "a notification only occurs for a change in overridden urls");
- aboutNewTabService.newTabURL = aboutNewTabService.generateRemoteURL();
- Assert.ok(aboutNewTabService.remoteEnabled, "Newtab remote should be enabled");
- aboutNewTabService.newTabURL = testURL;
- yield notificationPromise;
- Assert.ok(!aboutNewTabService.remoteEnabled, "Newtab remote should not be enabled");
-
- // reset twice, only one notification for default URL
- notificationPromise = nextChangeNotificationPromise(
- "about:newtab", "reset occurs");
- aboutNewTabService.resetNewTabURL();
- yield notificationPromise;
-
- cleanup();
-});
-
-/**
- * Verifies that releaseFromUpdateChannel
- * Returns the correct release names
- */
-add_task(function* test_release_names() {
- let valid_channels = ["esr", "release", "beta", "aurora", "nightly"];
- let invalid_channels = new Set(["default", "invalid"]);
-
- for (let channel of valid_channels) {
- Assert.equal(channel, aboutNewTabService.releaseFromUpdateChannel(channel),
- "release == channel name when valid");
- }
-
- for (let channel of invalid_channels) {
- Assert.equal("nightly", aboutNewTabService.releaseFromUpdateChannel(channel),
- "release == nightly when invalid");
- }
-});
-
-/**
- * Verifies that remote version updates changes the remote newtab url
- */
-add_task(function* test_version_update() {
- NewTabPrefsProvider.prefs.init();
-
- Services.prefs.setBoolPref("browser.newtabpage.remote", true);
- Assert.ok(aboutNewTabService.remoteEnabled, "remote mode enabled");
-
- let productionModeBaseUrl = "https://content.cdn.mozilla.net";
- let version_incr = String(parseInt(DEFAULT_VERSION) + 1);
- let expectedPath = `/newtab` +
- `/v${version_incr}` +
- `/${aboutNewTabService.remoteReleaseName}` +
- `/${Locale.getLocale()}` +
- `/index.html`;
- let expectedHref = productionModeBaseUrl + expectedPath;
-
- let notificationPromise;
- notificationPromise = nextChangeNotificationPromise(expectedHref);
- Preferences.set("browser.newtabpage.remote.version", version_incr);
- yield notificationPromise;
-
- cleanup();
-});
-
-function nextChangeNotificationPromise(aNewURL, testMessage) {
- return new Promise(resolve => {
- Services.obs.addObserver(function observer(aSubject, aTopic, aData) { // jshint unused:false
- Services.obs.removeObserver(observer, aTopic);
- Assert.equal(aData, aNewURL, testMessage);
- resolve();
- }, "newtab-url-changed", false);
- });
-}
diff --git a/browser/components/newtab/tests/xpcshell/test_NewTabPrefsProvider.js b/browser/components/newtab/tests/xpcshell/test_NewTabPrefsProvider.js
deleted file mode 100644
index f364d0300..000000000
--- a/browser/components/newtab/tests/xpcshell/test_NewTabPrefsProvider.js
+++ /dev/null
@@ -1,50 +0,0 @@
-"use strict";
-
-/* global XPCOMUtils, equal, Preferences, NewTabPrefsProvider, run_next_test */
-/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-
-const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabPrefsProvider",
- "resource:///modules/NewTabPrefsProvider.jsm");
-
-function run_test() {
- run_next_test();
-}
-
-add_task(function* test_observe() {
- let prefsMap = NewTabPrefsProvider.prefs.prefsMap;
- for (let prefName of prefsMap.keys()) {
- let prefValueType = prefsMap.get(prefName);
-
- let beforeVal;
- let afterVal;
-
- switch (prefValueType) {
- case "bool":
- beforeVal = false;
- afterVal = true;
- Preferences.set(prefName, beforeVal);
- break;
- case "localized":
- case "str":
- beforeVal = "";
- afterVal = "someStr";
- Preferences.set(prefName, beforeVal);
- break;
- }
- NewTabPrefsProvider.prefs.init();
- let promise = new Promise(resolve => {
- NewTabPrefsProvider.prefs.once(prefName, (name, data) => { // jshint ignore:line
- resolve([name, data]);
- });
- });
- Preferences.set(prefName, afterVal);
- let [actualName, actualData] = yield promise;
- equal(prefName, actualName, `emitter sent the correct pref: ${prefName}`);
- equal(afterVal, actualData, `emitter collected correct pref data for ${prefName}`);
- NewTabPrefsProvider.prefs.uninit();
- }
-});
diff --git a/browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js b/browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js
deleted file mode 100644
index 3e60b282a..000000000
--- a/browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js
+++ /dev/null
@@ -1,82 +0,0 @@
-"use strict";
-
-/* global XPCOMUtils, NewTabSearchProvider, run_next_test, ok, equal, do_check_true, do_get_profile, Services */
-/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-
-const Cu = Components.utils;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabSearchProvider",
- "resource:///modules/NewTabSearchProvider.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ContentSearch",
- "resource:///modules/ContentSearch.jsm");
-
-// ensure a profile exists
-do_get_profile();
-
-function run_test() {
- run_next_test();
-}
-
-function hasProp(obj) {
- return function(aProp) {
- ok(obj.hasOwnProperty(aProp), `expect to have property ${aProp}`);
- };
-}
-
-add_task(function* test_search() {
- ContentSearch.init();
- let observerPromise = new Promise(resolve => {
- Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
- if (aData === "init-complete" && aTopic === "browser-search-service") {
- Services.obs.removeObserver(observer, "browser-search-service");
- resolve();
- }
- }, "browser-search-service", false);
- });
- Services.search.init();
- yield observerPromise;
- do_check_true(Services.search.isInitialized);
-
- // get initial state of search and check it has correct properties
- let state = yield NewTabSearchProvider.search.asyncGetState();
- let stateProps = hasProp(state);
- ["engines", "currentEngine"].forEach(stateProps);
-
- // check that the current engine is correct and has correct properties
- let {currentEngine} = state;
- equal(currentEngine.name, Services.search.currentEngine.name, "Current engine has been correctly set");
- var engineProps = hasProp(currentEngine);
- ["name", "placeholder", "iconBuffer"].forEach(engineProps);
-
- // create dummy test engines to test observer
- Services.search.addEngineWithDetails("TestSearch1", "", "", "", "GET",
- "http://example.com/?q={searchTerms}");
- Services.search.addEngineWithDetails("TestSearch2", "", "", "", "GET",
- "http://example.com/?q={searchTerms}");
-
- // set one of the dummy test engines to the default engine
- Services.search.defaultEngine = Services.search.getEngineByName("TestSearch1");
-
- // test that the event emitter is working by setting a new current engine "TestSearch2"
- let engineName = "TestSearch2";
- NewTabSearchProvider.search.init();
-
- // event emitter will fire when current engine is changed
- let promise = new Promise(resolve => {
- NewTabSearchProvider.search.once("browser-search-engine-modified", (name, data) => { // jshint ignore:line
- resolve([name, data.name]);
- });
- });
-
- // set a new current engine
- Services.search.currentEngine = Services.search.getEngineByName(engineName);
- let expectedEngineName = Services.search.currentEngine.name;
-
- // emitter should fire and return the new engine
- let [eventName, actualEngineName] = yield promise;
- equal(eventName, "browser-search-engine-modified", `emitter sent the correct event ${eventName}`);
- equal(expectedEngineName, actualEngineName, `emitter set the correct engine ${expectedEngineName}`);
- NewTabSearchProvider.search.uninit();
-});
diff --git a/browser/components/newtab/tests/xpcshell/test_NewTabURL.js b/browser/components/newtab/tests/xpcshell/test_NewTabURL.js
deleted file mode 100644
index 1505e638c..000000000
--- a/browser/components/newtab/tests/xpcshell/test_NewTabURL.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/* globals Services, NewTabURL, XPCOMUtils, aboutNewTabService, NewTabPrefsProvider */
-"use strict";
-
-const {utils: Cu} = Components;
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/NewTabURL.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NewTabPrefsProvider",
- "resource:///modules/NewTabPrefsProvider.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
- "@mozilla.org/browser/aboutnewtab-service;1",
- "nsIAboutNewTabService");
-
-add_task(function*() {
- let defaultURL = aboutNewTabService.newTabURL;
- Services.prefs.setBoolPref("browser.newtabpage.remote", false);
-
- Assert.equal(NewTabURL.get(), defaultURL, `Default newtab URL should be ${defaultURL}`);
- let url = "http://example.com/";
- let notificationPromise = promiseNewtabURLNotification(url);
- NewTabURL.override(url);
- yield notificationPromise;
- Assert.ok(NewTabURL.overridden, "Newtab URL should be overridden");
- Assert.equal(NewTabURL.get(), url, "Newtab URL should be the custom URL");
-
- notificationPromise = promiseNewtabURLNotification(defaultURL);
- NewTabURL.reset();
- yield notificationPromise;
- Assert.ok(!NewTabURL.overridden, "Newtab URL should not be overridden");
- Assert.equal(NewTabURL.get(), defaultURL, "Newtab URL should be the default");
-
- // change newtab page to remote
- NewTabPrefsProvider.prefs.init();
- Services.prefs.setBoolPref("browser.newtabpage.remote", true);
- Assert.equal(NewTabURL.get(), "about:newtab", `Newtab URL should be about:newtab`);
- Assert.ok(!NewTabURL.overridden, "Newtab URL should not be overridden");
- NewTabPrefsProvider.prefs.uninit();
-});
-
-function promiseNewtabURLNotification(aNewURL) {
- return new Promise(resolve => {
- Services.obs.addObserver(function observer(aSubject, aTopic, aData) { // jshint ignore:line
- Services.obs.removeObserver(observer, aTopic);
- Assert.equal(aData, aNewURL, "Data for newtab-url-changed notification should be new URL.");
- resolve();
- }, "newtab-url-changed", false);
- });
-}
diff --git a/browser/components/newtab/tests/xpcshell/test_PlacesProvider.js b/browser/components/newtab/tests/xpcshell/test_PlacesProvider.js
deleted file mode 100644
index 22815741b..000000000
--- a/browser/components/newtab/tests/xpcshell/test_PlacesProvider.js
+++ /dev/null
@@ -1,358 +0,0 @@
-"use strict";
-
-/* global XPCOMUtils, PlacesUtils, PlacesTestUtils, PlacesProvider, NetUtil */
-/* global do_get_profile, run_next_test, add_task */
-/* global equal, ok */
-
-const {
- utils: Cu,
- interfaces: Ci,
-} = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesProvider",
- "resource:///modules/PlacesProvider.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
- "resource://gre/modules/PlacesUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
- "resource://testing-common/PlacesTestUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
- "resource://gre/modules/NetUtil.jsm");
-
-// ensure a profile exists
-do_get_profile();
-
-function run_test() {
- PlacesProvider.links.init();
- run_next_test();
-}
-
-// url prefix for test history population
-const TEST_URL = "https://mozilla.com/";
-// time when the test starts execution
-const TIME_NOW = (new Date()).getTime();
-
-// utility function to compute past timestap
-function timeDaysAgo(numDays) {
- return TIME_NOW - (numDays * 24 * 60 * 60 * 1000);
-}
-
-// utility function to make a visit for insetion into places db
-function makeVisit(index, daysAgo, isTyped, domain=TEST_URL) {
- let {
- TRANSITION_TYPED,
- TRANSITION_LINK
- } = PlacesUtils.history;
-
- return {
- uri: NetUtil.newURI(`${domain}${index}`),
- visitDate: timeDaysAgo(daysAgo),
- transition: (isTyped) ? TRANSITION_TYPED : TRANSITION_LINK,
- };
-}
-
-/** Test LinkChecker **/
-
-add_task(function test_LinkChecker_securityCheck() {
-
- let urls = [
- {url: "javascript:alert('hello')", expected: false}, // jshint ignore:line
- {url: "data:image/png;base64,XXX", expected: false},
- {url: "about:newtab", expected: true},
- {url: "https://example.com", expected: true},
- {url: "ftp://example.com", expected: true},
- {url: "file://home/file/image.png", expected: true},
- {url: "resource:///modules/PlacesProvider.jsm", expected: true},
- ];
- for (let {url, expected} of urls) {
- let observed = PlacesProvider.LinkChecker.checkLoadURI(url);
- equal(observed, expected, `can load "${url}"?`);
- }
-});
-
-/** Test Provider **/
-
-add_task(function* test_Links_getLinks() {
- yield PlacesTestUtils.clearHistory();
- let provider = PlacesProvider.links;
-
- let links = yield provider.getLinks();
- equal(links.length, 0, "empty history yields empty links");
-
- // add a visit
- let testURI = NetUtil.newURI("http://mozilla.com");
- yield PlacesTestUtils.addVisits(testURI);
-
- links = yield provider.getLinks();
- equal(links.length, 1, "adding a visit yields a link");
- equal(links[0].url, testURI.spec, "added visit corresponds to added url");
-});
-
-add_task(function* test_Links_getLinks_Order() {
- yield PlacesTestUtils.clearHistory();
- let provider = PlacesProvider.links;
-
- // all four visits must come from different domains to avoid deduplication
- let visits = [
- makeVisit(0, 0, true, "http://bar.com/"), // frecency 200, today
- makeVisit(1, 0, true, "http://foo.com/"), // frecency 200, today
- makeVisit(2, 2, true, "http://buz.com/"), // frecency 200, 2 days ago
- makeVisit(3, 2, false, "http://aaa.com/"), // frecency 10, 2 days ago, transition
- ];
-
- let links = yield provider.getLinks();
- equal(links.length, 0, "empty history yields empty links");
- yield PlacesTestUtils.addVisits(visits);
-
- links = yield provider.getLinks();
- equal(links.length, visits.length, "number of links added is the same as obtain by getLinks");
- for (let i = 0; i < links.length; i++) {
- equal(links[i].url, visits[i].uri.spec, "links are obtained in the expected order");
- }
-});
-
-add_task(function* test_Links_getLinks_Deduplication() {
- yield PlacesTestUtils.clearHistory();
- let provider = PlacesProvider.links;
-
- // all for visits must come from different domains to avoid deduplication
- let visits = [
- makeVisit(0, 2, true, "http://bar.com/"), // frecency 200, 2 days ago
- makeVisit(1, 0, true, "http://bar.com/"), // frecency 200, today
- makeVisit(2, 0, false, "http://foo.com/"), // frecency 10, today
- makeVisit(3, 0, true, "http://foo.com/"), // frecency 200, today
- ];
-
- let links = yield provider.getLinks();
- equal(links.length, 0, "empty history yields empty links");
- yield PlacesTestUtils.addVisits(visits);
-
- links = yield provider.getLinks();
- equal(links.length, 2, "only two links must be left after deduplication");
- equal(links[0].url, visits[1].uri.spec, "earliest link is present");
- equal(links[1].url, visits[3].uri.spec, "most fresent link is present");
-});
-
-add_task(function* test_Links_onLinkChanged() {
- let provider = PlacesProvider.links;
-
- let url = "https://example.com/onFrecencyChanged1";
- let linkChangedMsgCount = 0;
-
- let linkChangedPromise = new Promise(resolve => {
- let handler = (_, link) => { // jshint ignore:line
- /* There are 3 linkChanged events:
- * 1. visit insertion (-1 frecency by default)
- * 2. frecency score update (after transition type calculation etc)
- * 3. title change
- */
- if (link.url === url) {
- equal(link.url, url, `expected url on linkChanged event`);
- linkChangedMsgCount += 1;
- if (linkChangedMsgCount === 3) {
- ok(true, `all linkChanged events captured`);
- provider.off("linkChanged", this);
- resolve();
- }
- }
- };
- provider.on("linkChanged", handler);
- });
-
- // add a visit
- let testURI = NetUtil.newURI(url);
- yield PlacesTestUtils.addVisits(testURI);
- yield linkChangedPromise;
-
- yield PlacesTestUtils.clearHistory();
-});
-
-add_task(function* test_Links_onClearHistory() {
- let provider = PlacesProvider.links;
-
- let clearHistoryPromise = new Promise(resolve => {
- let handler = () => {
- ok(true, `clearHistory event captured`);
- provider.off("clearHistory", handler);
- resolve();
- };
- provider.on("clearHistory", handler);
- });
-
- // add visits
- for (let i = 0; i <= 10; i++) {
- let url = `https://example.com/onClearHistory${i}`;
- let testURI = NetUtil.newURI(url);
- yield PlacesTestUtils.addVisits(testURI);
- }
- yield PlacesTestUtils.clearHistory();
- yield clearHistoryPromise;
-});
-
-add_task(function* test_Links_onDeleteURI() {
- let provider = PlacesProvider.links;
-
- let testURL = "https://example.com/toDelete";
-
- let deleteURIPromise = new Promise(resolve => {
- let handler = (_, {url}) => { // jshint ignore:line
- equal(testURL, url, "deleted url and expected url are the same");
- provider.off("deleteURI", handler);
- resolve();
- };
-
- provider.on("deleteURI", handler);
- });
-
- let testURI = NetUtil.newURI(testURL);
- yield PlacesTestUtils.addVisits(testURI);
- yield PlacesUtils.history.remove(testURL);
- yield deleteURIPromise;
-});
-
-add_task(function* test_Links_onManyLinksChanged() {
- let provider = PlacesProvider.links;
-
- let promise = new Promise(resolve => {
- let handler = () => {
- ok(true);
- provider.off("manyLinksChanged", handler);
- resolve();
- };
-
- provider.on("manyLinksChanged", handler);
- });
-
- let testURL = "https://example.com/toDelete";
- let testURI = NetUtil.newURI(testURL);
- yield PlacesTestUtils.addVisits(testURI);
-
- // trigger DecayFrecency
- PlacesUtils.history.QueryInterface(Ci.nsIObserver).
- observe(null, "idle-daily", "");
-
- yield promise;
-});
-
-add_task(function* test_Links_execute_query() {
- yield PlacesTestUtils.clearHistory();
- let provider = PlacesProvider.links;
-
- let visits = [
- makeVisit(0, 0, true), // frecency 200, today
- makeVisit(1, 0, true), // frecency 200, today
- makeVisit(2, 2, true), // frecency 200, 2 days ago
- makeVisit(3, 2, false), // frecency 10, 2 days ago, transition
- ];
-
- yield PlacesTestUtils.addVisits(visits);
-
- function testItemValue(results, index, value) {
- equal(results[index][0], `${TEST_URL}${value}`, "raw url");
- equal(results[index][1], `test visit for ${TEST_URL}${value}`, "raw title");
- }
-
- function testItemObject(results, index, columnValues) {
- Object.keys(columnValues).forEach(name => {
- equal(results[index][name], columnValues[name], "object name " + name);
- });
- }
-
- // select all 4 records
- let results = yield provider.executePlacesQuery("select url, title from moz_places");
- equal(results.length, 4, "expect 4 items");
- // check for insert order sequence
- for (let i = 0; i < results.length; i++) {
- testItemValue(results, i, i);
- }
-
- // test parameter passing
- results = yield provider.executePlacesQuery(
- "select url, title from moz_places limit :limit",
- {params: {limit: 2}}
- );
- equal(results.length, 2, "expect 2 items");
- for (let i = 0; i < results.length; i++) {
- testItemValue(results, i, i);
- }
-
- // test extracting items by name
- results = yield provider.executePlacesQuery(
- "select url, title from moz_places limit :limit",
- {columns: ["url", "title"], params: {limit: 4}}
- );
- equal(results.length, 4, "expect 4 items");
- for (let i = 0; i < results.length; i++) {
- testItemObject(results, i, {
- "url": `${TEST_URL}${i}`,
- "title": `test visit for ${TEST_URL}${i}`,
- });
- }
-
- // test ordering
- results = yield provider.executePlacesQuery(
- "select url, title, last_visit_date, frecency from moz_places " +
- "order by frecency DESC, last_visit_date DESC, url DESC limit :limit",
- {columns: ["url", "title", "last_visit_date", "frecency"], params: {limit: 4}}
- );
- equal(results.length, 4, "expect 4 items");
- testItemObject(results, 0, {url: `${TEST_URL}1`});
- testItemObject(results, 1, {url: `${TEST_URL}0`});
- testItemObject(results, 2, {url: `${TEST_URL}2`});
- testItemObject(results, 3, {url: `${TEST_URL}3`});
-
- // test callback passing
- results = [];
- function handleRow(aRow) {
- results.push({
- url: aRow.getResultByName("url"),
- title: aRow.getResultByName("title"),
- last_visit_date: aRow.getResultByName("last_visit_date"),
- frecency: aRow.getResultByName("frecency")
- });
- }
- yield provider.executePlacesQuery(
- "select url, title, last_visit_date, frecency from moz_places " +
- "order by frecency DESC, last_visit_date DESC, url DESC",
- {callback: handleRow}
- );
- equal(results.length, 4, "expect 4 items");
- testItemObject(results, 0, {url: `${TEST_URL}1`});
- testItemObject(results, 1, {url: `${TEST_URL}0`});
- testItemObject(results, 2, {url: `${TEST_URL}2`});
- testItemObject(results, 3, {url: `${TEST_URL}3`});
-
- // negative test cases
- // bad sql
- try {
- yield provider.executePlacesQuery("select from moz");
- do_throw("bad sql should've thrown");
- }
- catch (e) {
- do_check_true("expected failure - bad sql");
- }
- // missing bindings
- try {
- yield provider.executePlacesQuery("select * from moz_places limit :limit");
- do_throw("bad sql should've thrown");
- }
- catch (e) {
- do_check_true("expected failure - missing bidning");
- }
- // non-existent column name
- try {
- yield provider.executePlacesQuery("select * from moz_places limit :limit",
- {columns: ["no-such-column"], params: {limit: 4}});
- do_throw("bad sql should've thrown");
- }
- catch (e) {
- do_check_true("expected failure - wrong column name");
- }
-
- // cleanup
- yield PlacesTestUtils.clearHistory();
-});
diff --git a/browser/components/newtab/tests/xpcshell/xpcshell.ini b/browser/components/newtab/tests/xpcshell/xpcshell.ini
deleted file mode 100644
index c249ee3e2..000000000
--- a/browser/components/newtab/tests/xpcshell/xpcshell.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[DEFAULT]
-head =
-tail =
-firefox-appdir = browser
-skip-if = toolkit == 'android'
-
-[test_AboutNewTabService.js]
-[test_NewTabPrefsProvider.js]
-[test_NewTabSearchProvider.js]
-[test_NewTabURL.js]
-[test_PlacesProvider.js]