Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/abp2blocklist.js

Issue 29452289: Issue 5283 - Add support for $websocket and $webrtc (Closed) Base URL: https://hg.adblockplus.org/abp2blocklist
Patch Set: Add top-level exception after copying rule Created July 9, 2017, 9:27 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
« no previous file with comments | « node_modules/filterClasses.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/abp2blocklist.js
===================================================================
--- a/test/abp2blocklist.js
+++ b/test/abp2blocklist.js
@@ -80,63 +80,68 @@
testRules(test, ["~test.com##whatever"], []);
test.done();
},
testRequestFilters: function(test)
{
testRules(test, ["/foo", "||test.com", "http://example.com/foo"], [
- {trigger: {"url-filter": "^https?://.*/foo",
+ {trigger: {"url-filter": "^[^:]+:(//)?.*/foo",
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"],
- "unless-top-url": ["^https?://.*/foo"]},
+ "unless-top-url": ["^[^:]+:(//)?.*/foo"]},
action: {type: "block"}},
- {trigger: {"url-filter": "^https?://([^/]+\\.)?test\\.com",
+ {trigger: {"url-filter": "^[^:]+:(//)?([^/]+\\.)?test\\.com",
"url-filter-is-case-sensitive": true,
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"],
- "unless-top-url": ["^https?://([^/]+\\.)?test\\.com"],
+ "unless-top-url": ["^[^:]+:(//)?([^/]+\\.)?test\\.com"],
"top-url-filter-is-case-sensitive": true},
action: {type: "block"}},
- {trigger: {"url-filter": "http://example\\.com/foo",
+ {trigger: {"url-filter": "^http://example\\.com/foo",
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"],
- "unless-top-url": ["http://example\\.com/foo"]},
+ "unless-top-url": ["^http://example\\.com/foo"]},
+ action: {type: "block"}},
+ {trigger: {"url-filter": "^[^:]+:(//)?.*http://example\\.com/foo",
+ "resource-type": ["image", "style-sheet", "script", "font",
+ "media", "raw", "document"],
+ "unless-top-url": ["^[^:]+:(//)?.*http://example\\.com/foo"]},
action: {type: "block"}}
]);
testRules(test, ["||example.com"], [
- {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com",
+ {trigger: {"url-filter": "^[^:]+:(//)?([^/]+\\.)?example\\.com",
"url-filter-is-case-sensitive": true,
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"],
- "unless-top-url": ["^https?://([^/]+\\.)?example\\.com"],
+ "unless-top-url": ["^[^:]+:(//)?([^/]+\\.)?example\\.com"],
"top-url-filter-is-case-sensitive": true},
action: {type: "block"}}
]);
// Rules which would match no resource-types shouldn't be generated.
testRules(test, ["foo$document", "||foo.com$document"], []);
test.done();
},
testRequestFilterExceptions: function(test)
{
testRules(test, ["@@example.com"], [
- {trigger: {"url-filter": "^https?://.*example\\.com",
+ {trigger: {"url-filter": "^[^:]+:(//)?.*example\\.com",
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"]},
action: {type: "ignore-previous-rules"}}
]);
testRules(test, ["@@||example.com"], [
- {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com",
+ {trigger: {"url-filter": "^[^:]+:(//)?([^/]+\\.)?example\\.com",
"url-filter-is-case-sensitive": true,
"resource-type": ["image", "style-sheet", "script", "font",
"media", "raw", "document"]},
action: {type: "ignore-previous-rules"}}
]);
test.done();
},
@@ -215,28 +220,32 @@
},
testRequestTypeMapping: function(test)
{
testRules(
test,
["1", "2$image", "3$stylesheet", "4$script", "5$font", "6$media",
"7$popup", "8$object", "9$object_subrequest", "10$xmlhttprequest",
- "11$ping", "12$subdocument", "13$other", "14$IMAGE",
- "15$script,PING,Popup", "16$~image"],
+ "11$websocket", "12$webrtc",
+ "13$ping", "14$subdocument", "15$other", "16$IMAGE",
+ "17$script,PING,Popup", "18$~image"],
[["image", "style-sheet", "script", "font", "media", "raw", "document" ],
["image"],
["style-sheet"],
["script"],
["font"],
["media"],
["popup"],
["media"],
["raw"],
["raw"],
+ ["raw"], // WebSocket
+ ["raw"], // WebRTC: STUN
+ ["raw"], // WebRTC: TURN
["raw"],
["document"],
["raw"],
["image"],
["script", "popup", "raw" ],
["style-sheet", "script", "font", "media", "raw", "document"]],
rules => rules.map(rule => rule.trigger["resource-type"])
);
@@ -275,10 +284,32 @@
testUnicode: function(test)
{
testRules(test, ["$domain=🐈.cat"], ["*xn--zn8h.cat"],
rules => rules[0]["trigger"]["if-domain"]);
testRules(test, ["🐈$domain=🐈.cat"], []);
testRules(test, ["###🐈"], []);
test.done();
+ },
+
+ testWebSocket: function(test)
+ {
+ testRules(test, ["foo$websocket"], [
+ {trigger: {"url-filter": "^wss?://.*foo", "resource-type": ["raw"]},
+ action: {type: "block"}}
+ ]);
+
+ test.done();
+ },
+
+ testWebRTC: function(test)
+ {
+ testRules(test, ["foo$webrtc"], [
+ {trigger: {"url-filter": "^stuns?:.*foo", "resource-type": ["raw"]},
+ action: {type: "block"}},
+ {trigger: {"url-filter": "^turns?:.*foo", "resource-type": ["raw"]},
+ action: {type: "block"}}
+ ]);
+
+ test.done();
}
};
« no previous file with comments | « node_modules/filterClasses.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld