OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 "use strict"; | 18 "use strict"; |
19 | 19 |
| 20 let {createSandbox} = require("common"); |
| 21 let sandboxedRequire = createSandbox(); |
| 22 |
20 let { | 23 let { |
21 Filter, InvalidFilter, CommentFilter, ActiveFilter, RegExpFilter, | 24 Filter, InvalidFilter, CommentFilter, ActiveFilter, RegExpFilter, |
22 BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, | 25 BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, |
23 ElemHideException, CSSPropertyFilter | 26 ElemHideException, CSSPropertyFilter |
24 } = require("../lib/filterClasses"); | 27 } = sandboxedRequire("filterClasses"); |
25 | 28 |
26 function serializeFilter(filter) | 29 function serializeFilter(filter) |
27 { | 30 { |
28 // Filter serialization only writes out essential properties, need to do a ful
l serialization here | 31 // Filter serialization only writes out essential properties, need to do a ful
l serialization here |
29 let result = []; | 32 let result = []; |
30 result.push("text=" + filter.text); | 33 result.push("text=" + filter.text); |
31 if (filter instanceof InvalidFilter) | 34 if (filter instanceof InvalidFilter) |
32 { | 35 { |
33 result.push("type=invalid"); | 36 result.push("type=invalid"); |
34 result.push("reason=" + filter.reason); | 37 result.push("reason=" + filter.reason); |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 compareFilter(test, "blabla_non_default", ["type=filterlist", "text=blabla_non
_default", "regexp=blabla_non_default", "disabled=true", "hitCount=12", "lastHit
=20"], function(filter) | 240 compareFilter(test, "blabla_non_default", ["type=filterlist", "text=blabla_non
_default", "regexp=blabla_non_default", "disabled=true", "hitCount=12", "lastHit
=20"], function(filter) |
238 { | 241 { |
239 filter.disabled = true; | 242 filter.disabled = true; |
240 filter.hitCount = 12; | 243 filter.hitCount = 12; |
241 filter.lastHit = 20; | 244 filter.lastHit = 20; |
242 }); | 245 }); |
243 | 246 |
244 test.done(); | 247 test.done(); |
245 }; | 248 }; |
246 | 249 |
247 let t = RegExpFilter.typeMap; | 250 let t = require("filterClasses").RegExpFilter.typeMap; |
248 let defaultTypes = 0x7FFFFFFF & ~(t.ELEMHIDE | t.DOCUMENT | t.POPUP | t.GENERICH
IDE | t.GENERICBLOCK); | 251 let defaultTypes = 0x7FFFFFFF & ~(t.ELEMHIDE | t.DOCUMENT | t.POPUP | t.GENERICH
IDE | t.GENERICBLOCK); |
249 | 252 |
250 exports.testSpecialCharacters = function(test) | 253 exports.testSpecialCharacters = function(test) |
251 { | 254 { |
252 compareFilter(test, "/ddd|f?a[s]d/", ["type=filterlist", "text=/ddd|f?a[s]d/",
"regexp=ddd|f?a[s]d"]); | 255 compareFilter(test, "/ddd|f?a[s]d/", ["type=filterlist", "text=/ddd|f?a[s]d/",
"regexp=ddd|f?a[s]d"]); |
253 compareFilter(test, "*asdf*d**dd*", ["type=filterlist", "text=*asdf*d**dd*", "
regexp=asdf.*d.*dd"]); | 256 compareFilter(test, "*asdf*d**dd*", ["type=filterlist", "text=*asdf*d**dd*", "
regexp=asdf.*d.*dd"]); |
254 compareFilter(test, "|*asd|f*d**dd*|", ["type=filterlist", "text=|*asd|f*d**dd
*|", "regexp=^.*asd\\|f.*d.*dd.*$"]); | 257 compareFilter(test, "|*asd|f*d**dd*|", ["type=filterlist", "text=|*asd|f*d**dd
*|", "regexp=^.*asd\\|f.*d.*dd.*$"]); |
255 compareFilter(test, "dd[]{}$%<>&()d", ["type=filterlist", "text=dd[]{}$%<>&()d
", "regexp=dd\\[\\]\\{\\}\\$\\%\\<\\>\\&\\(\\)d"]); | 258 compareFilter(test, "dd[]{}$%<>&()d", ["type=filterlist", "text=dd[]{}$%<>&()d
", "regexp=dd\\[\\]\\{\\}\\$\\%\\<\\>\\&\\(\\)d"]); |
256 | 259 |
257 compareFilter(test, "@@/ddd|f?a[s]d/", ["type=whitelist", "text=@@/ddd|f?a[s]d
/", "regexp=ddd|f?a[s]d", "contentType=" + defaultTypes]); | 260 compareFilter(test, "@@/ddd|f?a[s]d/", ["type=whitelist", "text=@@/ddd|f?a[s]d
/", "regexp=ddd|f?a[s]d", "contentType=" + defaultTypes]); |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 compareFilter(test, "foo.com,~bar##[-abp-properties='abc']", ["type=cssrule",
"text=foo.com,~bar##[-abp-properties='abc']", "selectorDomain=foo.com", "selecto
r=[-abp-properties='abc']", "domains=FOO.COM|~BAR", "regexp=abc"]); | 339 compareFilter(test, "foo.com,~bar##[-abp-properties='abc']", ["type=cssrule",
"text=foo.com,~bar##[-abp-properties='abc']", "selectorDomain=foo.com", "selecto
r=[-abp-properties='abc']", "domains=FOO.COM|~BAR", "regexp=abc"]); |
337 compareFilter(test, "~foo.com,bar.com##[-abp-properties='abc']", ["type=cssrul
e", "text=~foo.com,bar.com##[-abp-properties='abc']", "selectorDomain=bar.com",
"selector=[-abp-properties='abc']", "domains=BAR.COM|~FOO.COM", "regexp=abc"]); | 340 compareFilter(test, "~foo.com,bar.com##[-abp-properties='abc']", ["type=cssrul
e", "text=~foo.com,bar.com##[-abp-properties='abc']", "selectorDomain=bar.com",
"selector=[-abp-properties='abc']", "domains=BAR.COM|~FOO.COM", "regexp=abc"]); |
338 | 341 |
339 compareFilter(test, "##[-abp-properties='']", ["type=elemhide", "text=##[-abp-
properties='']", "selector=[-abp-properties='']"]); | 342 compareFilter(test, "##[-abp-properties='']", ["type=elemhide", "text=##[-abp-
properties='']", "selector=[-abp-properties='']"]); |
340 compareFilter(test, "foo.com#@#[-abp-properties='abc']", ["type=elemhideexcept
ion", "text=foo.com#@#[-abp-properties='abc']", "selectorDomain=foo.com", "selec
tor=[-abp-properties='abc']", "domains=FOO.COM"]); | 343 compareFilter(test, "foo.com#@#[-abp-properties='abc']", ["type=elemhideexcept
ion", "text=foo.com#@#[-abp-properties='abc']", "selectorDomain=foo.com", "selec
tor=[-abp-properties='abc']", "domains=FOO.COM"]); |
341 compareFilter(test, "foo.com##aaa [-abp-properties='abc'] bbb", ["type=cssrule
", "text=foo.com##aaa [-abp-properties='abc'] bbb", "selectorDomain=foo.com", "s
elector=aaa [-abp-properties='abc'] bbb", "domains=FOO.COM", "prefix=aaa ", "reg
exp=abc", "suffix= bbb"]); | 344 compareFilter(test, "foo.com##aaa [-abp-properties='abc'] bbb", ["type=cssrule
", "text=foo.com##aaa [-abp-properties='abc'] bbb", "selectorDomain=foo.com", "s
elector=aaa [-abp-properties='abc'] bbb", "domains=FOO.COM", "prefix=aaa ", "reg
exp=abc", "suffix= bbb"]); |
342 compareFilter(test, "foo.com##[-abp-properties='|background-image: url(data:*)
']", ["type=cssrule", "text=foo.com##[-abp-properties='|background-image: url(da
ta:*)']", "selectorDomain=foo.com", "selector=[-abp-properties='|background-imag
e: url(data:*)']", "domains=FOO.COM", "regexp=^background\\-image\\:\\ url\\(dat
a\\:.*\\)"]); | 345 compareFilter(test, "foo.com##[-abp-properties='|background-image: url(data:*)
']", ["type=cssrule", "text=foo.com##[-abp-properties='|background-image: url(da
ta:*)']", "selectorDomain=foo.com", "selector=[-abp-properties='|background-imag
e: url(data:*)']", "domains=FOO.COM", "regexp=^background\\-image\\:\\ url\\(dat
a\\:.*\\)"]); |
343 | 346 |
344 test.done(); | 347 test.done(); |
345 }; | 348 }; |
OLD | NEW |