chrome/content/tests/regexpFilters_matching.js - Issue 29321487: Issue 2738 - Fix tests to pass type bit mask to matching functions

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: chrome/content/tests/regexpFilters_matching.js

Issue 29321487: Issue 2738 - Fix tests to pass type bit mask to matching functions (Closed)

Patch Set: Updated to match adblockplus changes Created July 12, 2015, 2:05 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: chrome/content/tests/regexpFilters_matching.js

diff --git a/chrome/content/tests/regexpFilters_matching.js b/chrome/content/tests/regexpFilters_matching.js

index adbaa5e75bf4604dc12b2567900d2b06b3157a0a..044b26f764a279c27bb8c431afba05612ac9bfd2 100644

--- a/chrome/content/tests/regexpFilters_matching.js

+++ b/chrome/content/tests/regexpFilters_matching.js

@@ -7,7 +7,7 @@

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

{

let filter = Filter.fromText(text);

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

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

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);

« no previous file with comments | « chrome/content/tests/performance/matching.html ('k') | no next file » | no next file with comments »