test/matcher.js - Issue 30011555: Issue 7303 - Deprecate the use of String.prototype.substr()

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/matcher.js

Issue 30011555: Issue 7303 - Deprecate the use of String.prototype.substr() (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/

Patch Set: Rebase. Revert changes in hot path. Created Feb. 21, 2019, 6:09 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

Index: test/matcher.js

===================================================================

--- a/test/matcher.js

+++ b/test/matcher.js

@@ -83,18 +83,18 @@

test.equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));

// Generic whitelisting rules can match for specificOnly searches, so we

// can't easily know which rule will match for these whitelisting tests

if (specificOnly)

continue;

// For next run: add whitelisting filters for filters that aren't already

- filters = filters.map(text => text.substr(0, 2) == "@@" ? text : "@@" + text);

- if (expected && expected.substr(0, 2) != "@@")

+ filters = filters.map(text => text.substring(0, 2) == "@@" ? text : "@@" + text);

+ if (expected && expected.substring(0, 2) != "@@")

expected = "@@" + expected;

}

function checkSearch(test, filters, location, contentType, docDomain,

thirdParty, sitekey, specificOnly, filterType,

expected)

{

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