Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/notification.js

Issue 30025555: Issue 6820 - Move tests to mocha (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Rebased. Created April 5, 2019, 4:16 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/matcher.js ('k') | test/regexpFilters_matching.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/notification.js
===================================================================
--- a/test/notification.js
+++ b/test/notification.js
@@ -12,563 +12,568 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
*/
"use strict";
+const assert = require("assert");
+
let {
- createSandbox, setupTimerAndFetch, setupRandomResult, unexpectedError
+ createSandbox, setupTimerAndFetch, setupRandomResult
} = require("./_common");
let Prefs = null;
let Utils = null;
let Notification = null;
// Only starting NodeJS 10 that URL is in the global space.
const {URL} = require("url");
-exports.setUp = function(callback)
-{
- // Inject our Array and JSON to make sure that instanceof checks on arrays
- // within the sandbox succeed even with data passed in from outside.
- let globals = Object.assign({Array, JSON},
- setupTimerAndFetch.call(this), setupRandomResult.call(this));
-
- let sandboxedRequire = createSandbox({globals});
- (
- {Prefs} = sandboxedRequire("./stub-modules/prefs"),
- {Utils} = sandboxedRequire("./stub-modules/utils"),
- {Notification} = sandboxedRequire("../lib/notification")
- );
-
- callback();
-};
-
-function showNotifications(location)
+describe("Notifications", () =>
{
- let shownNotifications = [];
- function showListener(notification)
+ let runner = {};
+
+ beforeEach(() =>
{
- shownNotifications.push(notification);
- Notification.markAsShown(notification.id);
+ runner = {};
+ // Inject our Array and JSON to make sure that instanceof checks on arrays
+ // within the sandbox succeed even with data passed in from outside.
+ let globals = Object.assign({Array, JSON},
+ setupTimerAndFetch.call(runner), setupRandomResult.call(runner));
+
+ let sandboxedRequire = createSandbox({globals});
+ (
+ {Prefs} = sandboxedRequire("./stub-modules/prefs"),
+ {Utils} = sandboxedRequire("./stub-modules/utils"),
+ {Notification} = sandboxedRequire("../lib/notification")
+ );
+ });
+
+ function showNotifications(location)
+ {
+ let shownNotifications = [];
+ function showListener(notification)
+ {
+ shownNotifications.push(notification);
+ Notification.markAsShown(notification.id);
+ }
+ Notification.addShowListener(showListener);
+ Notification.showNext(location && new URL(location));
+ Notification.removeShowListener(showListener);
+ return shownNotifications;
}
- Notification.addShowListener(showListener);
- Notification.showNext(location && new URL(location));
- Notification.removeShowListener(showListener);
- return shownNotifications;
-}
-function* pairs(array)
-{
- for (let element1 of array)
+ function* pairs(array)
{
- for (let element2 of array)
+ for (let element1 of array)
{
- if (element1 != element2)
- yield [element1, element2];
+ for (let element2 of array)
+ {
+ if (element1 != element2)
+ yield [element1, element2];
+ }
}
}
-}
-function registerHandler(notifications, checkCallback)
-{
- this.registerHandler("/notification.json", metadata =>
+ function registerHandler(notifications, checkCallback)
{
- if (checkCallback)
- checkCallback(metadata);
-
- let notification = {
- version: 55,
- notifications
- };
-
- return [200, JSON.stringify(notification)];
- });
-}
-
-exports.testNoData = function(test)
-{
- test.deepEqual(showNotifications(), [], "No notifications should be returned if there is no data");
- test.done();
-};
-
-exports.testSingleNotification = function(test)
-{
- let information = {
- id: 1,
- type: "information",
- message: {"en-US": "Information"}
- };
-
- registerHandler.call(this, [information]);
- this.runScheduledTasks(1).then(() =>
- {
- test.deepEqual(showNotifications(), [information], "The notification is shown");
- test.deepEqual(showNotifications(), [], "Informational notifications aren't shown more than once");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ runner.registerHandler("/notification.json", metadata =>
+ {
+ if (checkCallback)
+ checkCallback(metadata);
-exports.testInformationAndCritical = function(test)
-{
- let information = {
- id: 1,
- type: "information",
- message: {"en-US": "Information"}
- };
- let critical = {
- id: 2,
- type: "critical",
- message: {"en-US": "Critical"}
- };
-
- registerHandler.call(this, [information, critical]);
- this.runScheduledTasks(1).then(() =>
- {
- test.deepEqual(showNotifications(), [critical], "The critical notification is given priority");
- test.deepEqual(showNotifications(), [critical], "Critical notifications can be shown multiple times");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ let notification = {
+ version: 55,
+ notifications
+ };
-exports.testNoType = function(test)
-{
- let information = {
- id: 1,
- message: {"en-US": "Information"}
- };
+ return [200, JSON.stringify(notification)];
+ });
+ }
- registerHandler.call(this, [information]);
- this.runScheduledTasks(1).then(() =>
+ it("No Data", () =>
{
- test.deepEqual(showNotifications(), [information], "The notification is shown");
- test.deepEqual(showNotifications(), [], "Notification is treated as type information");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ assert.deepEqual(showNotifications(), [], "No notifications should be returned if there is no data");
+ });
-function testTargetSelectionFunc(propName, value, result)
-{
- return function(test)
+ it("Single Notificaion", () =>
{
- let targetInfo = {};
- targetInfo[propName] = value;
-
let information = {
id: 1,
type: "information",
- message: {"en-US": "Information"},
- targets: [targetInfo]
+ message: {"en-US": "Information"}
};
- registerHandler.call(this, [information]);
- this.runScheduledTasks(1).then(() =>
+ registerHandler.call(runner, [information]);
+ return runner.runScheduledTasks(1).then(() =>
{
- let expected = (result ? [information] : []);
- test.deepEqual(showNotifications(), expected, "Selected notification for " + JSON.stringify(information.targets));
- test.deepEqual(showNotifications(), [], "No notification on second call");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
- };
-}
-
-exports.testTargetSelection = {};
+ assert.deepEqual(showNotifications(), [information], "The notification is shown");
+ assert.deepEqual(showNotifications(), [], "Informational notifications aren't shown more than once");
+ });
+ });
-for (let [propName, value, result] of [
- ["extension", "adblockpluschrome", true],
- ["extension", "adblockplus", false],
- ["extension", "adblockpluschrome2", false],
- ["extensionMinVersion", "1.4", true],
- ["extensionMinVersion", "1.4.1", true],
- ["extensionMinVersion", "1.5", false],
- ["extensionMaxVersion", "1.5", true],
- ["extensionMaxVersion", "1.4.1", true],
- ["extensionMaxVersion", "1.4.*", true],
- ["extensionMaxVersion", "1.4", false],
- ["application", "chrome", true],
- ["application", "firefox", false],
- ["applicationMinVersion", "27.0", true],
- ["applicationMinVersion", "27", true],
- ["applicationMinVersion", "26", true],
- ["applicationMinVersion", "28", false],
- ["applicationMinVersion", "27.1", false],
- ["applicationMinVersion", "27.0b1", true],
- ["applicationMaxVersion", "27.0", true],
- ["applicationMaxVersion", "27", true],
- ["applicationMaxVersion", "28", true],
- ["applicationMaxVersion", "26", false],
- ["applicationMaxVersion", "27.0b1", false],
- ["platform", "chromium", true],
- ["platform", "gecko", false],
- ["platformMinVersion", "12.0", true],
- ["platformMinVersion", "12", true],
- ["platformMinVersion", "11", true],
- ["platformMinVersion", "13", false],
- ["platformMinVersion", "12.1", false],
- ["platformMinVersion", "12.0b1", true],
- ["platformMaxVersion", "12.0", true],
- ["platformMaxVersion", "12", true],
- ["platformMaxVersion", "13", true],
- ["platformMaxVersion", "11", false],
- ["platformMaxVersion", "12.0b1", false],
- ["blockedTotalMin", "11", false],
- ["blockedTotalMin", "10", true],
- ["blockedTotalMax", "10", true],
- ["blockedTotalMax", "1", false],
- ["locales", ["en-US"], true],
- ["locales", ["en-US", "de-DE"], true],
- ["locales", ["de-DE"], false],
- ["locales", ["en-GB", "de-DE"], false]
-])
-{
- exports.testTargetSelection[`${propName}=${value}`] = testTargetSelectionFunc(propName, value, result);
-}
-
-exports.testTargetSelectionNoShowStats = {
-
- setUp(callback)
+ it("Information and Critical", () =>
{
- this.show_statsinpopup_orig = Prefs.show_statsinpopup;
- Prefs.show_statsinpopup = false;
- callback();
- },
- tearDown(callback)
- {
- Prefs.show_statsinpopup = this.show_statsinpopup_orig;
- callback();
- }
-};
-for (let [propName, value, result] of [
- ["blockedTotalMin", "10", false],
- ["blockedTotalMax", "10", false]
-])
-{
- exports.testTargetSelectionNoShowStats[`${propName}=${value}`] = testTargetSelectionFunc(propName, value, result);
-}
-
-exports.testMultipleTargets = {};
-
-for (let [[propName1, value1, result1], [propName2, value2, result2]] of pairs([
- ["extension", "adblockpluschrome", true],
- ["extension", "adblockplus", false],
- ["extensionMinVersion", "1.4", true],
- ["extensionMinVersion", "1.5", false],
- ["application", "chrome", true],
- ["application", "firefox", false],
- ["applicationMinVersion", "27", true],
- ["applicationMinVersion", "28", false],
- ["platform", "chromium", true],
- ["platform", "gecko", false],
- ["platformMinVersion", "12", true],
- ["platformMinVersion", "13", false],
- ["unknown", "unknown", false]
-]))
-{
- exports.testMultipleTargets[`${propName1}=${value1},${propName2}=${value2}`] = function(test)
- {
- let targetInfo1 = {};
- targetInfo1[propName1] = value1;
- let targetInfo2 = {};
- targetInfo2[propName2] = value2;
-
let information = {
id: 1,
type: "information",
- message: {"en-US": "Information"},
- targets: [targetInfo1, targetInfo2]
+ message: {"en-US": "Information"}
+ };
+ let critical = {
+ id: 2,
+ type: "critical",
+ message: {"en-US": "Critical"}
+ };
+
+ registerHandler.call(this, [information, critical]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [critical], "The critical notification is given priority");
+ assert.deepEqual(showNotifications(), [critical], "Critical notifications can be shown multiple times");
+ });
+ });
+
+ it("No Type", () =>
+ {
+ let information = {
+ id: 1,
+ message: {"en-US": "Information"}
};
registerHandler.call(this, [information]);
- this.runScheduledTasks(1).then(() =>
+ return runner.runScheduledTasks(1).then(() =>
{
- let expected = (result1 || result2 ? [information] : []);
- test.deepEqual(showNotifications(), expected, "Selected notification for " + JSON.stringify(information.targets));
- }).catch(unexpectedError.bind(test)).then(() => test.done());
- };
-}
+ assert.deepEqual(showNotifications(), [information], "The notification is shown");
+ assert.deepEqual(showNotifications(), [], "Notification is treated as type information");
+ });
+ });
-exports.testParametersSent = function(test)
-{
- Prefs.notificationdata = {
- data: {
- version: "3"
- }
- };
-
- let parameters = null;
- registerHandler.call(this, [], metadata =>
- {
- parameters = decodeURI(metadata.queryString);
- });
- this.runScheduledTasks(1).then(() =>
+ function testTargetSelectionFunc(propName, value, result)
{
- test.equal(parameters,
- "addonName=adblockpluschrome&addonVersion=1.4.1&application=chrome&applicationVersion=27.0&platform=chromium&platformVersion=12.0&lastVersion=3&downloadCount=0",
- "The correct parameters are sent to the server");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ return function()
+ {
+ let targetInfo = {};
+ targetInfo[propName] = value;
-exports.testExpirationInterval = {};
+ let information = {
+ id: 1,
+ type: "information",
+ message: {"en-US": "Information"},
+ targets: [targetInfo]
+ };
-let initialDelay = 1 / 60;
-for (let currentTest of [
- {
- randomResult: 0.5,
- requests: [initialDelay, initialDelay + 24, initialDelay + 48]
- },
- {
- randomResult: 0, // Changes interval by factor 0.8 (19.2 hours)
- requests: [initialDelay, initialDelay + 20, initialDelay + 40]
- },
- {
- randomResult: 1, // Changes interval by factor 1.2 (28.8 hours)
- requests: [initialDelay, initialDelay + 29, initialDelay + 58]
- },
- {
- randomResult: 0.25, // Changes interval by factor 0.9 (21.6 hours)
- requests: [initialDelay, initialDelay + 22, initialDelay + 44]
- },
+ registerHandler.call(this, [information]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ let expected = (result ? [information] : []);
+ assert.deepEqual(showNotifications(), expected, "Selected notification for " + JSON.stringify(information.targets));
+ assert.deepEqual(showNotifications(), [], "No notification on second call");
+ });
+ };
+ }
+
+ describe("Target selection", () =>
{
- randomResult: 0.5,
- skipAfter: initialDelay + 5,
- skip: 10, // Short break should not increase soft expiration
- requests: [initialDelay, initialDelay + 24]
- },
+ for (let [propName, value, result] of [
+ ["extension", "adblockpluschrome", true],
+ ["extension", "adblockplus", false],
+ ["extension", "adblockpluschrome2", false],
+ ["extensionMinVersion", "1.4", true],
+ ["extensionMinVersion", "1.4.1", true],
+ ["extensionMinVersion", "1.5", false],
+ ["extensionMaxVersion", "1.5", true],
+ ["extensionMaxVersion", "1.4.1", true],
+ ["extensionMaxVersion", "1.4.*", true],
+ ["extensionMaxVersion", "1.4", false],
+ ["application", "chrome", true],
+ ["application", "firefox", false],
+ ["applicationMinVersion", "27.0", true],
+ ["applicationMinVersion", "27", true],
+ ["applicationMinVersion", "26", true],
+ ["applicationMinVersion", "28", false],
+ ["applicationMinVersion", "27.1", false],
+ ["applicationMinVersion", "27.0b1", true],
+ ["applicationMaxVersion", "27.0", true],
+ ["applicationMaxVersion", "27", true],
+ ["applicationMaxVersion", "28", true],
+ ["applicationMaxVersion", "26", false],
+ ["applicationMaxVersion", "27.0b1", false],
+ ["platform", "chromium", true],
+ ["platform", "gecko", false],
+ ["platformMinVersion", "12.0", true],
+ ["platformMinVersion", "12", true],
+ ["platformMinVersion", "11", true],
+ ["platformMinVersion", "13", false],
+ ["platformMinVersion", "12.1", false],
+ ["platformMinVersion", "12.0b1", true],
+ ["platformMaxVersion", "12.0", true],
+ ["platformMaxVersion", "12", true],
+ ["platformMaxVersion", "13", true],
+ ["platformMaxVersion", "11", false],
+ ["platformMaxVersion", "12.0b1", false],
+ ["blockedTotalMin", "11", false],
+ ["blockedTotalMin", "10", true],
+ ["blockedTotalMax", "10", true],
+ ["blockedTotalMax", "1", false],
+ ["locales", ["en-US"], true],
+ ["locales", ["en-US", "de-DE"], true],
+ ["locales", ["de-DE"], false],
+ ["locales", ["en-GB", "de-DE"], false]
+ ])
+ {
+ it(`Target ${propName}=${value}`, testTargetSelectionFunc(propName, value, result));
+ }
+ });
+
+ describe("No show stats", () =>
{
- randomResult: 0.5,
- skipAfter: initialDelay + 5,
- skip: 30, // Long break should increase soft expiration, hitting hard expiration
- requests: [initialDelay, initialDelay + 48]
- }
-])
-{
- let testId = "Math.random() returning " + currentTest.randomResult;
- if (typeof currentTest.skip != "number")
- testId += " skipping " + currentTest.skip + " hours after " + currentTest.skipAfter + " hours";
- exports.testExpirationInterval[testId] = function(test)
- {
- let requests = [];
- registerHandler.call(this, [], metadata => requests.push(this.getTimeOffset()));
+ beforeEach(() =>
+ {
+ runner.show_statsinpopup_orig = Prefs.show_statsinpopup;
+ Prefs.show_statsinpopup = false;
+ });
- this.randomResult = currentTest.randomResult;
-
- let maxHours = Math.round(Math.max.apply(null, currentTest.requests)) + 1;
- this.runScheduledTasks(maxHours, currentTest.skipAfter, currentTest.skip).then(() =>
+ afterEach(() =>
{
- test.deepEqual(requests, currentTest.requests, "Requests");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
- };
-}
+ Prefs.show_statsinpopup = runner.show_statsinpopup_orig;
+ });
-exports.testUsingSeverityInsteadOfType = function(test)
-{
- let severityNotification = {
- id: 1,
- severity: "information",
- message: {"en-US": "Information"}
- };
+ for (let [propName, value, result] of [
+ ["blockedTotalMin", "10", false],
+ ["blockedTotalMax", "10", false]
+ ])
+ {
+ it(`Target ${propName}=${value}`, testTargetSelectionFunc(propName, value, result));
+ }
+ });
- function listener(name)
+ describe("Multiple Targets", () =>
{
- if (name !== "notificationdata")
- return;
+ for (let [[propName1, value1, result1], [propName2, value2, result2]] of pairs([
+ ["extension", "adblockpluschrome", true],
+ ["extension", "adblockplus", false],
+ ["extensionMinVersion", "1.4", true],
+ ["extensionMinVersion", "1.5", false],
+ ["application", "chrome", true],
+ ["application", "firefox", false],
+ ["applicationMinVersion", "27", true],
+ ["applicationMinVersion", "28", false],
+ ["platform", "chromium", true],
+ ["platform", "gecko", false],
+ ["platformMinVersion", "12", true],
+ ["platformMinVersion", "13", false],
+ ["unknown", "unknown", false]
+ ]))
+ {
+ it(`Targets ${propName1}=${value1},${propName2}=${value2}`, () =>
+ {
+ let targetInfo1 = {};
+ targetInfo1[propName1] = value1;
+ let targetInfo2 = {};
+ targetInfo2[propName2] = value2;
+
+ let information = {
+ id: 1,
+ type: "information",
+ message: {"en-US": "Information"},
+ targets: [targetInfo1, targetInfo2]
+ };
- Prefs.removeListener(listener);
- let notification = Prefs.notificationdata.data.notifications[0];
- test.ok(!("severity" in notification), "Severity property was removed");
- test.ok("type" in notification, "Type property was added");
- test.equal(notification.type, severityNotification.severity, "Type property has correct value");
- test.done();
- }
- Prefs.addListener(listener);
+ registerHandler.call(this, [information]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ let expected = (result1 || result2 ? [information] : []);
+ assert.deepEqual(showNotifications(), expected, "Selected notification for " + JSON.stringify(information.targets));
+ });
+ });
+ }
+ });
- let responseText = JSON.stringify({
- notifications: [severityNotification]
+ it("Parameters Sent", () =>
+ {
+ Prefs.notificationdata = {
+ data: {
+ version: "3"
+ }
+ };
+
+ let parameters = null;
+ registerHandler.call(this, [], metadata =>
+ {
+ parameters = decodeURI(metadata.queryString);
+ });
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.equal(parameters,
+ "addonName=adblockpluschrome&addonVersion=1.4.1&application=chrome&applicationVersion=27.0&platform=chromium&platformVersion=12.0&lastVersion=3&downloadCount=0",
+ "The correct parameters are sent to the server");
+ });
});
- Notification._onDownloadSuccess({}, responseText, () => {}, () => {});
-};
-exports.testURLSpecificNotification = function(test)
-{
- let withURLFilterFoo = {
- id: 1,
- urlFilters: ["foo.com$document"]
- };
- let withoutURLFilter = {
- id: 2
- };
- let withURLFilterBar = {
- id: 3,
- urlFilters: ["bar.com$document"]
- };
- let subdomainURLFilter = {
- id: 4,
- urlFilters: ["||example.com$document"]
- };
-
- registerHandler.call(this, [
- withURLFilterFoo,
- withoutURLFilter,
- withURLFilterBar,
- subdomainURLFilter
- ]);
- this.runScheduledTasks(1).then(() =>
+ describe("Expiration Interval", () =>
{
- test.deepEqual(showNotifications(), [withoutURLFilter], "URL-specific notifications are skipped");
- test.deepEqual(showNotifications("http://foo.com"), [withURLFilterFoo], "URL-specific notification is retrieved");
- test.deepEqual(showNotifications("http://foo.com"), [], "URL-specific notification is not retrieved");
- test.deepEqual(showNotifications("http://www.example.com"), [subdomainURLFilter], "URL-specific notification matches subdomain");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ let initialDelay = 1 / 60;
+ for (let currentTest of [
+ {
+ randomResult: 0.5,
+ requests: [initialDelay, initialDelay + 24, initialDelay + 48]
+ },
+ {
+ randomResult: 0, // Changes interval by factor 0.8 (19.2 hours)
+ requests: [initialDelay, initialDelay + 20, initialDelay + 40]
+ },
+ {
+ randomResult: 1, // Changes interval by factor 1.2 (28.8 hours)
+ requests: [initialDelay, initialDelay + 29, initialDelay + 58]
+ },
+ {
+ randomResult: 0.25, // Changes interval by factor 0.9 (21.6 hours)
+ requests: [initialDelay, initialDelay + 22, initialDelay + 44]
+ },
+ {
+ randomResult: 0.5,
+ skipAfter: initialDelay + 5,
+ skip: 10, // Short break should not increase soft expiration
+ requests: [initialDelay, initialDelay + 24]
+ },
+ {
+ randomResult: 0.5,
+ skipAfter: initialDelay + 5,
+ skip: 30, // Long break should increase soft expiration, hitting hard expiration
+ requests: [initialDelay, initialDelay + 48]
+ }
+ ])
+ {
+ let testId = `Math.random() returning ${currentTest.randomResult}`;
+ if (typeof currentTest.skip == "number")
+ testId += ` skipping ${currentTest.skip} hours after ${currentTest.skipAfter} hours`;
-exports.testInterval = function(test)
-{
- let relentless = {
- id: 3,
- type: "relentless",
- interval: 100
- };
+ it(testId, () =>
+ {
+ let requests = [];
+ registerHandler.call(this, [], metadata => requests.push(runner.getTimeOffset()));
+
+ runner.randomResult = currentTest.randomResult;
- registerHandler.call(this, [relentless]);
- this.runScheduledTasks(1).then(() =>
- {
- test.deepEqual(showNotifications(), [relentless], "Relentless notifications are shown initially");
- }).then(() =>
+ let maxHours = Math.round(Math.max.apply(null, currentTest.requests)) + 1;
+ return runner.runScheduledTasks(maxHours, currentTest.skipAfter, currentTest.skip).then(() =>
+ {
+ assert.deepEqual(requests, currentTest.requests, "Requests");
+ });
+ });
+ }
+ });
+
+ it("Using severity instead of type", done =>
{
- test.deepEqual(showNotifications(), [], "Relentless notifications are not shown before the interval");
- }).then(() =>
+ let severityNotification = {
+ id: 1,
+ severity: "information",
+ message: {"en-US": "Information"}
+ };
+
+ function listener(name)
+ {
+ if (name !== "notificationdata")
+ return;
+
+ Prefs.removeListener(listener);
+ let notification = Prefs.notificationdata.data.notifications[0];
+ assert.ok(!("severity" in notification), "Severity property was removed");
+ assert.ok("type" in notification, "Type property was added");
+ assert.equal(notification.type, severityNotification.severity, "Type property has correct value");
+ done();
+ }
+ Prefs.addListener(listener);
+
+ let responseText = JSON.stringify({
+ notifications: [severityNotification]
+ });
+ Notification._onDownloadSuccess({}, responseText, () => {}, () => {});
+ });
+
+ it("URL Specific Notification", () =>
{
- // Date always returns a fixed time (see setupTimerAndFetch) so we
- // manipulate the shown data manually.
- Prefs.notificationdata.shown[relentless.id] -= relentless.interval;
- test.deepEqual(showNotifications(), [relentless], "Relentless notifications are shown after the interval");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ let withURLFilterFoo = {
+ id: 1,
+ urlFilters: ["foo.com$document"]
+ };
+ let withoutURLFilter = {
+ id: 2
+ };
+ let withURLFilterBar = {
+ id: 3,
+ urlFilters: ["bar.com$document"]
+ };
+ let subdomainURLFilter = {
+ id: 4,
+ urlFilters: ["||example.com$document"]
+ };
-exports.testRelentlessNotification = function(test)
-{
- let relentless = {
- id: 3,
- type: "relentless",
- interval: 100,
- urlFilters: ["foo.com$document", "bar.foo$document"]
- };
+ registerHandler.call(this, [
+ withURLFilterFoo,
+ withoutURLFilter,
+ withURLFilterBar,
+ subdomainURLFilter
+ ]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [withoutURLFilter], "URL-specific notifications are skipped");
+ assert.deepEqual(showNotifications("http://foo.com"), [withURLFilterFoo], "URL-specific notification is retrieved");
+ assert.deepEqual(showNotifications("http://foo.com"), [], "URL-specific notification is not retrieved");
+ assert.deepEqual(showNotifications("http://www.example.com"), [subdomainURLFilter], "URL-specific notification matches subdomain");
+ });
+ });
- registerHandler.call(this, [relentless]);
- this.runScheduledTasks(1).then(() =>
+ it("Interval", () =>
{
- test.deepEqual(showNotifications(), [], "Relentless notification is not shown without URL");
- test.deepEqual(showNotifications("http://bar.com"), [], "Relentless notification is not shown for a non-matching URL");
- test.deepEqual(showNotifications("http://foo.com"), [relentless], "Relentless notification is shown for a matching URL");
- }).then(() =>
- {
- test.deepEqual(showNotifications("http://foo.com"), [], "Relentless notifications are not shown before the interval");
- }).then(() =>
+ let relentless = {
+ id: 3,
+ type: "relentless",
+ interval: 100
+ };
+
+ registerHandler.call(this, [relentless]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [relentless], "Relentless notifications are shown initially");
+ }).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [], "Relentless notifications are not shown before the interval");
+ }).then(() =>
+ {
+ // Date always returns a fixed time (see setupTimerAndFetch) so we
+ // manipulate the shown data manually.
+ Prefs.notificationdata.shown[relentless.id] -= relentless.interval;
+ assert.deepEqual(showNotifications(), [relentless], "Relentless notifications are shown after the interval");
+ });
+ });
+
+ it("Relentless notification", () =>
{
- // Date always returns a fixed time (see setupTimerAndFetch) so we
- // manipulate the shown data manually.
- Prefs.notificationdata.shown[relentless.id] -= relentless.interval;
- test.deepEqual(showNotifications(), [], "Relentless notifications are not shown after the interval without URL");
- test.deepEqual(showNotifications("http://bar.com"), [], "Relentless notifications are not shown after the interval for a non-matching URL");
- test.deepEqual(showNotifications("http://bar.foo.com"), [relentless], "Relentless notifications are shown after the interval for a matching URL");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
+ let relentless = {
+ id: 3,
+ type: "relentless",
+ interval: 100,
+ urlFilters: ["foo.com$document", "bar.foo$document"]
+ };
-exports.testGlobalOptOut = function(test)
-{
- Notification.toggleIgnoreCategory("*", true);
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Force enable global opt-out");
- Notification.toggleIgnoreCategory("*", true);
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Force enable global opt-out (again)");
- Notification.toggleIgnoreCategory("*", false);
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Force disable global opt-out");
- Notification.toggleIgnoreCategory("*", false);
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Force disable global opt-out (again)");
- Notification.toggleIgnoreCategory("*");
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Toggle enable global opt-out");
- Notification.toggleIgnoreCategory("*");
- test.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Toggle disable global opt-out");
+ registerHandler.call(this, [relentless]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [], "Relentless notification is not shown without URL");
+ assert.deepEqual(showNotifications("http://bar.com"), [], "Relentless notification is not shown for a non-matching URL");
+ assert.deepEqual(showNotifications("http://foo.com"), [relentless], "Relentless notification is shown for a matching URL");
+ }).then(() =>
+ {
+ assert.deepEqual(showNotifications("http://foo.com"), [], "Relentless notifications are not shown before the interval");
+ }).then(() =>
+ {
+ // Date always returns a fixed time (see setupTimerAndFetch) so we
+ // manipulate the shown data manually.
+ Prefs.notificationdata.shown[relentless.id] -= relentless.interval;
+ assert.deepEqual(showNotifications(), [], "Relentless notifications are not shown after the interval without URL");
+ assert.deepEqual(showNotifications("http://bar.com"), [], "Relentless notifications are not shown after the interval for a non-matching URL");
+ assert.deepEqual(showNotifications("http://bar.foo.com"), [relentless], "Relentless notifications are shown after the interval for a matching URL");
+ });
+ });
- Prefs.notifications_showui = false;
- Notification.toggleIgnoreCategory("*", false);
- test.ok(!Prefs.notifications_showui, "Opt-out UI will not be shown if global opt-out hasn't been enabled yet");
- Notification.toggleIgnoreCategory("*", true);
- test.ok(Prefs.notifications_showui, "Opt-out UI will be shown after enabling global opt-out");
- Notification.toggleIgnoreCategory("*", false);
- test.ok(Prefs.notifications_showui, "Opt-out UI will be shown after enabling global opt-out even if it got disabled again");
+ it("Global opt-out", () =>
+ {
+ Notification.toggleIgnoreCategory("*", true);
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Force enable global opt-out");
+ Notification.toggleIgnoreCategory("*", true);
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Force enable global opt-out (again)");
+ Notification.toggleIgnoreCategory("*", false);
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Force disable global opt-out");
+ Notification.toggleIgnoreCategory("*", false);
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Force disable global opt-out (again)");
+ Notification.toggleIgnoreCategory("*");
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") != -1, "Toggle enable global opt-out");
+ Notification.toggleIgnoreCategory("*");
+ assert.ok(Prefs.notifications_ignoredcategories.indexOf("*") == -1, "Toggle disable global opt-out");
- let information = {
- id: 1,
- type: "information"
- };
- let critical = {
- id: 2,
- type: "critical"
- };
- let relentless = {
- id: 3,
- type: "relentless"
- };
+ Prefs.notifications_showui = false;
+ Notification.toggleIgnoreCategory("*", false);
+ assert.ok(!Prefs.notifications_showui, "Opt-out UI will not be shown if global opt-out hasn't been enabled yet");
+ Notification.toggleIgnoreCategory("*", true);
+ assert.ok(Prefs.notifications_showui, "Opt-out UI will be shown after enabling global opt-out");
+ Notification.toggleIgnoreCategory("*", false);
+ assert.ok(Prefs.notifications_showui, "Opt-out UI will be shown after enabling global opt-out even if it got disabled again");
- Notification.toggleIgnoreCategory("*", true);
- registerHandler.call(this, [information]);
- this.runScheduledTasks(1).then(() =>
- {
- test.deepEqual(showNotifications(), [], "Information notifications are ignored after enabling global opt-out");
- Notification.toggleIgnoreCategory("*", false);
- test.deepEqual(showNotifications(), [information], "Information notifications are shown after disabling global opt-out");
+ let information = {
+ id: 1,
+ type: "information"
+ };
+ let critical = {
+ id: 2,
+ type: "critical"
+ };
+ let relentless = {
+ id: 3,
+ type: "relentless"
+ };
Notification.toggleIgnoreCategory("*", true);
- Prefs.notificationdata = {};
- registerHandler.call(this, [critical]);
- return this.runScheduledTasks(1);
- }).then(() =>
- {
- test.deepEqual(showNotifications(), [critical], "Critical notifications are not ignored");
+ registerHandler.call(this, [information]);
+ return runner.runScheduledTasks(1).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [], "Information notifications are ignored after enabling global opt-out");
+ Notification.toggleIgnoreCategory("*", false);
+ assert.deepEqual(showNotifications(), [information], "Information notifications are shown after disabling global opt-out");
- Prefs.notificationdata = {};
- registerHandler.call(this, [relentless]);
- return this.runScheduledTasks(1);
- }).then(() =>
+ Notification.toggleIgnoreCategory("*", true);
+ Prefs.notificationdata = {};
+ registerHandler.call(this, [critical]);
+ return runner.runScheduledTasks(1);
+ }).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [critical], "Critical notifications are not ignored");
+
+ Prefs.notificationdata = {};
+ registerHandler.call(this, [relentless]);
+ return runner.runScheduledTasks(1);
+ }).then(() =>
+ {
+ assert.deepEqual(showNotifications(), [relentless], "Relentless notifications are not ignored");
+ });
+ });
+
+ it("Message without localization", () =>
{
- test.deepEqual(showNotifications(), [relentless], "Relentless notifications are not ignored");
- }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
-
-exports.testMessageWithoutLocalization = function(test)
-{
- let notification = {message: "non-localized"};
- let texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "non-localized");
- test.done();
-};
+ let notification = {message: "non-localized"};
+ let texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "non-localized");
+ });
-exports.testLanguageOnly = function(test)
-{
- let notification = {message: {fr: "fr"}};
- Utils.appLocale = "fr";
- let texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "fr");
- Utils.appLocale = "fr-CA";
- texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "fr");
- test.done();
-};
+ it("Language only", () =>
+ {
+ let notification = {message: {fr: "fr"}};
+ Utils.appLocale = "fr";
+ let texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "fr");
+ Utils.appLocale = "fr-CA";
+ texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "fr");
+ });
-exports.testLanguageAndCountry = function(test)
-{
- let notification = {message: {"fr": "fr", "fr-CA": "fr-CA"}};
- Utils.appLocale = "fr-CA";
- let texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "fr-CA");
- Utils.appLocale = "fr";
- texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "fr");
- test.done();
-};
+ it("Language and Country", () =>
+ {
+ let notification = {message: {"fr": "fr", "fr-CA": "fr-CA"}};
+ Utils.appLocale = "fr-CA";
+ let texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "fr-CA");
+ Utils.appLocale = "fr";
+ texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "fr");
+ });
-exports.testMissingTranslation = function(test)
-{
- let notification = {message: {"en-US": "en-US"}};
- Utils.appLocale = "fr";
- let texts = Notification.getLocalizedTexts(notification);
- test.equal(texts.message, "en-US");
- test.done();
-};
+ it("Missing translation", () =>
+ {
+ let notification = {message: {"en-US": "en-US"}};
+ Utils.appLocale = "fr";
+ let texts = Notification.getLocalizedTexts(notification);
+ assert.equal(texts.message, "en-US");
+ });
+});
« no previous file with comments | « test/matcher.js ('k') | test/regexpFilters_matching.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld