| Index: chrome/content/tests/matcher.js |
| =================================================================== |
| --- a/chrome/content/tests/matcher.js |
| +++ b/chrome/content/tests/matcher.js |
| @@ -173,35 +173,35 @@ |
| checkMatch(["/bar$domain=foo.com"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, true, "/bar$domain=foo.com"); |
| }); |
| test("Result cache checks", function() |
| { |
| let matcher = new CombinedMatcher(); |
| matcher.add(Filter.fromText("abc$image")); |
| matcher.add(Filter.fromText("abc$script")); |
| - matcher.add(Filter.fromText("abc$~image,~script,~media,~ping")); |
| + matcher.add(Filter.fromText("abc$~image,~script,~object,~ping")); |
| matcher.add(Filter.fromText("cba$third-party")); |
| matcher.add(Filter.fromText("cba$~third-party,~script")); |
| matcher.add(Filter.fromText("http://def$image")); |
| matcher.add(Filter.fromText("http://def$script")); |
| - matcher.add(Filter.fromText("http://def$~image,~script,~media,~ping")); |
| + matcher.add(Filter.fromText("http://def$~image,~script,~object,~ping")); |
| matcher.add(Filter.fromText("http://fed$third-party")); |
| matcher.add(Filter.fromText("http://fed$~third-party,~script")); |
| cacheCheck(matcher, "http://abc", "IMAGE", null, false, "abc$image"); |
| cacheCheck(matcher, "http://abc", "SCRIPT", null, false, "abc$script"); |
| - cacheCheck(matcher, "http://abc", "OTHER", null, false, "abc$~image,~script,~media,~ping"); |
| + cacheCheck(matcher, "http://abc", "OTHER", null, false, "abc$~image,~script,~object,~ping"); |
| cacheCheck(matcher, "http://cba", "IMAGE", null, false, "cba$~third-party,~script"); |
| cacheCheck(matcher, "http://cba", "IMAGE", null, true, "cba$third-party"); |
| cacheCheck(matcher, "http://def", "IMAGE", null, false, "http://def$image"); |
| cacheCheck(matcher, "http://def", "SCRIPT", null, false, "http://def$script"); |
| - cacheCheck(matcher, "http://def", "OTHER", null, false, "http://def$~image,~script,~media,~ping"); |
| + cacheCheck(matcher, "http://def", "OTHER", null, false, "http://def$~image,~script,~object,~ping"); |
| cacheCheck(matcher, "http://fed", "IMAGE", null, false, "http://fed$~third-party,~script"); |
| cacheCheck(matcher, "http://fed", "IMAGE", null, true, "http://fed$third-party"); |
| - cacheCheck(matcher, "http://abc_cba", "MEDIA", null, false, "cba$~third-party,~script"); |
| - cacheCheck(matcher, "http://abc_cba", "MEDIA", null, true, "cba$third-party"); |
| + cacheCheck(matcher, "http://abc_cba", "OBJECT", null, false, "cba$~third-party,~script"); |
| + cacheCheck(matcher, "http://abc_cba", "OBJECT", null, true, "cba$third-party"); |
| cacheCheck(matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script"); |
| - cacheCheck(matcher, "http://def?http://fed", "MEDIA", null, false, "http://fed$~third-party,~script"); |
| - cacheCheck(matcher, "http://def?http://fed", "MEDIA", null, true, "http://fed$third-party"); |
| + cacheCheck(matcher, "http://def?http://fed", "OBJECT", null, false, "http://fed$~third-party,~script"); |
| + cacheCheck(matcher, "http://def?http://fed", "OBJECT", null, true, "http://fed$third-party"); |
| cacheCheck(matcher, "http://def?http://fed", "SCRIPT", null, false, "http://def$script"); |
| }); |
| })(); |