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

Index: chrome/content/tests/matcher.js

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

index 1387d888168c3ccf932877122cb0176e809ad444..8a1d6c536a79d98d370ea2821212dd2641f60154 100644

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

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

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

for (let filter of filters)

matcher.add(Filter.fromText(filter));

- let result = matcher.matchesAny(location, contentType, docDomain, thirdParty, sitekey);

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

if (result)

result = result.text;

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

for (let filter of filters)

combinedMatcher.add(Filter.fromText(filter));

- let result = combinedMatcher.matchesAny(location, contentType, docDomain, thirdParty, sitekey);

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

if (result)

result = result.text;

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

function cacheCheck(matcher, location, contentType, docDomain, thirdParty, expected)

{

- let result = matcher.matchesAny(location, contentType, docDomain, thirdParty);

+ let result = matcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty);

if (result)

result = result.text;

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