test/regexpFilters_matching.js - Issue 29375915: Issue 4878 - Start using ESLint for adblockpluscore

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: test/regexpFilters_matching.js

Issue 29375915: Issue 4878 - Start using ESLint for adblockpluscore (Closed)

Patch Set: Addressed Sebastian's initial feedback Created Feb. 21, 2017, 6:12 a.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

Index: test/regexpFilters_matching.js

diff --git a/test/regexpFilters_matching.js b/test/regexpFilters_matching.js

index 8017945dece3c8853665ef668be1446d22647eaa..dbe310f1becb67915923513e7f9b11457a4f811f 100644

--- a/test/regexpFilters_matching.js

+++ b/test/regexpFilters_matching.js

@@ -34,17 +34,18 @@ exports.setUp = function(callback)

+function testMatchInternal(test, text, location, contentType, docDomain, thirdParty, sitekey, expected)

+ let filter = Filter.fromText(text);

+ let result = filter.matches(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey);

+ test.equal(!!result, expected, '"' + text + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");

function testMatch(test, text, location, contentType, docDomain, thirdParty, sitekey, expected)

{

- function testMatch_internal(text, location, contentType, docDomain, thirdParty, sitekey, expected)

- {

- let filter = Filter.fromText(text);

- let result = filter.matches(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey);

- test.equal(!!result, expected, '"' + text + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");

- }

- testMatch_internal(text, location, contentType, docDomain, thirdParty, sitekey, expected);

+ testMatchInternal(test, text, location, contentType, docDomain, thirdParty, sitekey, expected);

if (!/^@@/.test(text))

- testMatch_internal("@@" + text, location, contentType, docDomain, thirdParty, sitekey, expected);

+ testMatchInternal(test, "@@" + text, location, contentType, docDomain, thirdParty, sitekey, expected);

}

exports.testBasicFilters = function(test)

« test/_common.js ('K') | « test/notification.js ('k') | test/signatures.js » ('j') | no next file with comments »