LEFT | RIGHT |
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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 const {createSandbox} = require("./_common"); | 20 const {createSandbox} = require("./_common"); |
21 let sandboxedRequire = null; | 21 let sandboxedRequire = null; |
22 | 22 |
23 let FilterStorage = null; | 23 let filterStorage = null; |
24 let Subscription = null; | 24 let Subscription = null; |
25 let Filter = null; | 25 let Filter = null; |
26 let defaultMatcher = null; | 26 let defaultMatcher = null; |
27 let SpecialSubscription = null; | 27 let SpecialSubscription = null; |
28 | 28 |
29 exports.setUp = function(callback) | 29 exports.setUp = function(callback) |
30 { | 30 { |
31 sandboxedRequire = createSandbox({ | 31 sandboxedRequire = createSandbox({ |
32 extraExports: { | 32 extraExports: { |
33 elemHide: ["knownFilters"], | 33 elemHide: ["knownFilters"], |
34 elemHideEmulation: ["filters"], | 34 elemHideEmulation: ["filters"], |
35 elemHideExceptions: ["knownExceptions"], | 35 elemHideExceptions: ["knownExceptions"], |
36 snippets: ["filters"] | 36 snippets: ["filters"] |
37 } | 37 } |
38 }); | 38 }); |
39 | 39 |
40 // We need to require the filterListener module so that filter changes will be | 40 // We need to require the filterListener module so that filter changes will be |
41 // noticed, even though we don't directly use the module here. | 41 // noticed, even though we don't directly use the module here. |
42 sandboxedRequire("../lib/filterListener"); | 42 sandboxedRequire("../lib/filterListener"); |
43 | 43 |
44 ( | 44 ( |
45 {FilterStorage} = sandboxedRequire("../lib/filterStorage"), | 45 {filterStorage} = sandboxedRequire("../lib/filterStorage"), |
46 {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionC
lasses"), | 46 {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionC
lasses"), |
47 {Filter} = sandboxedRequire("../lib/filterClasses"), | 47 {Filter} = sandboxedRequire("../lib/filterClasses"), |
48 {defaultMatcher} = sandboxedRequire("../lib/matcher") | 48 {defaultMatcher} = sandboxedRequire("../lib/matcher") |
49 ); | 49 ); |
50 | 50 |
51 FilterStorage.addSubscription(Subscription.fromURL("~fl~")); | 51 filterStorage.addSubscription(Subscription.fromURL("~fl~")); |
52 FilterStorage.addSubscription(Subscription.fromURL("~wl~")); | 52 filterStorage.addSubscription(Subscription.fromURL("~wl~")); |
53 FilterStorage.addSubscription(Subscription.fromURL("~eh~")); | 53 filterStorage.addSubscription(Subscription.fromURL("~eh~")); |
54 | 54 |
55 Subscription.fromURL("~fl~").defaults = ["blocking"]; | 55 Subscription.fromURL("~fl~").defaults = ["blocking"]; |
56 Subscription.fromURL("~wl~").defaults = ["whitelist"]; | 56 Subscription.fromURL("~wl~").defaults = ["whitelist"]; |
57 Subscription.fromURL("~eh~").defaults = ["elemhide"]; | 57 Subscription.fromURL("~eh~").defaults = ["elemhide"]; |
58 | 58 |
59 callback(); | 59 callback(); |
60 }; | 60 }; |
61 | 61 |
62 function checkKnownFilters(test, text, expected) | 62 function checkKnownFilters(test, text, expected) |
63 { | 63 { |
64 let result = {}; | 64 let result = {}; |
65 for (let type of ["blacklist", "whitelist"]) | 65 for (let type of ["blacklist", "whitelist"]) |
66 { | 66 { |
67 let matcher = defaultMatcher[type]; | 67 let matcher = defaultMatcher["_" + type]; |
68 let filters = []; | 68 let filters = []; |
69 let allFilters = Object.assign(matcher._fastFilterByKeyword, | 69 for (let [keyword, set] of matcher._filterByKeyword) |
70 matcher.filterByKeyword); | 70 { |
71 for (let [keyword, set] of allFilters) | 71 for (let filter of set) |
| 72 { |
| 73 test.equal(matcher.findKeyword(filter), keyword, |
| 74 "Keyword of filter " + filter.text); |
| 75 filters.push(filter.text); |
| 76 } |
| 77 } |
| 78 for (let [keyword, set] of matcher._fastFilterByKeyword) |
72 { | 79 { |
73 for (let filter of set) | 80 for (let filter of set) |
74 { | 81 { |
75 test.equal(matcher.findKeyword(filter), keyword, | 82 test.equal(matcher.findKeyword(filter), keyword, |
76 "Keyword of filter " + filter.text); | 83 "Keyword of filter " + filter.text); |
77 filters.push(filter.text); | 84 filters.push(filter.text); |
78 } | 85 } |
79 } | 86 } |
80 result[type] = filters; | 87 result[type] = filters; |
81 } | 88 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 exports.testAddingAndRemovingFilters = function(test) | 124 exports.testAddingAndRemovingFilters = function(test) |
118 { | 125 { |
119 let filter1 = Filter.fromText("filter1"); | 126 let filter1 = Filter.fromText("filter1"); |
120 let filter2 = Filter.fromText("@@filter2"); | 127 let filter2 = Filter.fromText("@@filter2"); |
121 let filter3 = Filter.fromText("##filter3"); | 128 let filter3 = Filter.fromText("##filter3"); |
122 let filter4 = Filter.fromText("!filter4"); | 129 let filter4 = Filter.fromText("!filter4"); |
123 let filter5 = Filter.fromText("#@#filter5"); | 130 let filter5 = Filter.fromText("#@#filter5"); |
124 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6')"); | 131 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6')"); |
125 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); | 132 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); |
126 | 133 |
127 FilterStorage.addFilter(filter1); | 134 filterStorage.addFilter(filter1); |
128 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text]}); | 135 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text]}); |
129 FilterStorage.addFilter(filter2); | 136 filterStorage.addFilter(filter2); |
130 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 137 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
131 FilterStorage.addFilter(filter3); | 138 filterStorage.addFilter(filter3); |
132 checkKnownFilters(test, "add ##filter3", {blacklist: [filter1.text], whitelist
: [filter2.text], elemhide: [filter3.text]}); | 139 checkKnownFilters(test, "add ##filter3", {blacklist: [filter1.text], whitelist
: [filter2.text], elemhide: [filter3.text]}); |
133 FilterStorage.addFilter(filter4); | 140 filterStorage.addFilter(filter4); |
134 checkKnownFilters(test, "add !filter4", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text]}); | 141 checkKnownFilters(test, "add !filter4", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text]}); |
135 FilterStorage.addFilter(filter5); | 142 filterStorage.addFilter(filter5); |
136 checkKnownFilters(test, "add #@#filter5", {blacklist: [filter1.text], whitelis
t: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]})
; | 143 checkKnownFilters(test, "add #@#filter5", {blacklist: [filter1.text], whitelis
t: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]})
; |
137 FilterStorage.addFilter(filter6); | 144 filterStorage.addFilter(filter6); |
138 checkKnownFilters(test, "add example.com##:-abp-properties(filter6)", {blackli
st: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhid
eexception: [filter5.text], elemhideemulation: [filter6.text]}); | 145 checkKnownFilters(test, "add example.com##:-abp-properties(filter6)", {blackli
st: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhid
eexception: [filter5.text], elemhideemulation: [filter6.text]}); |
139 FilterStorage.addFilter(filter7); | 146 filterStorage.addFilter(filter7); |
140 checkKnownFilters(test, "add example.com#@#[-abp-properties='filter7']", {blac
klist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elem
hideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]})
; | 147 checkKnownFilters(test, "add example.com#@#[-abp-properties='filter7']", {blac
klist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elem
hideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]})
; |
141 | 148 |
142 FilterStorage.removeFilter(filter1); | 149 filterStorage.removeFilter(filter1); |
143 checkKnownFilters(test, "remove filter1", {whitelist: [filter2.text], elemhide
: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhideemula
tion: [filter6.text]}); | 150 checkKnownFilters(test, "remove filter1", {whitelist: [filter2.text], elemhide
: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhideemula
tion: [filter6.text]}); |
144 filter2.disabled = true; | 151 filter2.disabled = true; |
145 checkKnownFilters(test, "disable filter2", {elemhide: [filter3.text], elemhide
exception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); | 152 checkKnownFilters(test, "disable filter2", {elemhide: [filter3.text], elemhide
exception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); |
146 FilterStorage.removeFilter(filter2); | 153 filterStorage.removeFilter(filter2); |
147 checkKnownFilters(test, "remove filter2", {elemhide: [filter3.text], elemhidee
xception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); | 154 checkKnownFilters(test, "remove filter2", {elemhide: [filter3.text], elemhidee
xception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); |
148 FilterStorage.removeFilter(filter4); | 155 filterStorage.removeFilter(filter4); |
149 checkKnownFilters(test, "remove filter4", {elemhide: [filter3.text], elemhidee
xception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); | 156 checkKnownFilters(test, "remove filter4", {elemhide: [filter3.text], elemhidee
xception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]}); |
150 | 157 |
151 test.done(); | 158 test.done(); |
152 }; | 159 }; |
153 | 160 |
154 exports.testDisablingEnablingFiltersNotInTheList = function(test) | 161 exports.testDisablingEnablingFiltersNotInTheList = function(test) |
155 { | 162 { |
156 let filter1 = Filter.fromText("filter1"); | 163 let filter1 = Filter.fromText("filter1"); |
157 let filter2 = Filter.fromText("@@filter2"); | 164 let filter2 = Filter.fromText("@@filter2"); |
158 let filter3 = Filter.fromText("##filter3"); | 165 let filter3 = Filter.fromText("##filter3"); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 filter2.disabled = true; | 207 filter2.disabled = true; |
201 let filter3 = Filter.fromText("##filter3"); | 208 let filter3 = Filter.fromText("##filter3"); |
202 let filter4 = Filter.fromText("!filter4"); | 209 let filter4 = Filter.fromText("!filter4"); |
203 let filter5 = Filter.fromText("#@#filter5"); | 210 let filter5 = Filter.fromText("#@#filter5"); |
204 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); | 211 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); |
205 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); | 212 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); |
206 | 213 |
207 let subscription = Subscription.fromURL("http://test1/"); | 214 let subscription = Subscription.fromURL("http://test1/"); |
208 subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6,
filter7]; | 215 subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6,
filter7]; |
209 | 216 |
210 FilterStorage.addSubscription(subscription); | 217 filterStorage.addSubscription(subscription); |
211 checkKnownFilters(test, "add subscription with filter1, @@filter2, ##filter3,
!filter4, #@#filter5, example.com#?#:-abp-properties(filter6), example.com#@#[-a
bp-properties='filter7']", {blacklist: [filter1.text], elemhide: [filter3.text],
elemhideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.te
xt]}); | 218 checkKnownFilters(test, "add subscription with filter1, @@filter2, ##filter3,
!filter4, #@#filter5, example.com#?#:-abp-properties(filter6), example.com#@#[-a
bp-properties='filter7']", {blacklist: [filter1.text], elemhide: [filter3.text],
elemhideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.te
xt]}); |
212 | 219 |
213 filter2.disabled = false; | 220 filter2.disabled = false; |
214 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); | 221 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); |
215 | 222 |
216 FilterStorage.addFilter(filter1); | 223 filterStorage.addFilter(filter1); |
217 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); | 224 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); |
218 | 225 |
219 FilterStorage.updateSubscriptionFilters(subscription, [filter4]); | 226 filterStorage.updateSubscriptionFilters(subscription, [filter4]); |
220 checkKnownFilters(test, "change subscription filters to filter4", {blacklist:
[filter1.text]}); | 227 checkKnownFilters(test, "change subscription filters to filter4", {blacklist:
[filter1.text]}); |
221 | 228 |
222 FilterStorage.removeFilter(filter1); | 229 filterStorage.removeFilter(filter1); |
223 checkKnownFilters(test, "remove filter1", {}); | 230 checkKnownFilters(test, "remove filter1", {}); |
224 | 231 |
225 FilterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]); | 232 filterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]); |
226 checkKnownFilters(test, "change subscription filters to filter1, filter2", {bl
acklist: [filter1.text], whitelist: [filter2.text]}); | 233 checkKnownFilters(test, "change subscription filters to filter1, filter2", {bl
acklist: [filter1.text], whitelist: [filter2.text]}); |
227 | 234 |
228 filter1.disabled = true; | 235 filter1.disabled = true; |
229 checkKnownFilters(test, "disable filter1", {whitelist: [filter2.text]}); | 236 checkKnownFilters(test, "disable filter1", {whitelist: [filter2.text]}); |
230 filter2.disabled = true; | 237 filter2.disabled = true; |
231 checkKnownFilters(test, "disable filter2", {}); | 238 checkKnownFilters(test, "disable filter2", {}); |
232 filter1.disabled = false; | 239 filter1.disabled = false; |
233 filter2.disabled = false; | 240 filter2.disabled = false; |
234 checkKnownFilters(test, "enable filter1, filter2", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 241 checkKnownFilters(test, "enable filter1, filter2", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
235 | 242 |
236 FilterStorage.addFilter(filter1); | 243 filterStorage.addFilter(filter1); |
237 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text]}); | 244 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text]}); |
238 | 245 |
239 subscription.disabled = true; | 246 subscription.disabled = true; |
240 checkKnownFilters(test, "disable subscription", {blacklist: [filter1.text]}); | 247 checkKnownFilters(test, "disable subscription", {blacklist: [filter1.text]}); |
241 | 248 |
242 FilterStorage.removeSubscription(subscription); | 249 filterStorage.removeSubscription(subscription); |
243 checkKnownFilters(test, "remove subscription", {blacklist: [filter1.text]}); | 250 checkKnownFilters(test, "remove subscription", {blacklist: [filter1.text]}); |
244 | 251 |
245 FilterStorage.addSubscription(subscription); | 252 filterStorage.addSubscription(subscription); |
246 checkKnownFilters(test, "add subscription", {blacklist: [filter1.text]}); | 253 checkKnownFilters(test, "add subscription", {blacklist: [filter1.text]}); |
247 | 254 |
248 subscription.disabled = false; | 255 subscription.disabled = false; |
249 checkKnownFilters(test, "enable subscription", {blacklist: [filter1.text], whi
telist: [filter2.text]}); | 256 checkKnownFilters(test, "enable subscription", {blacklist: [filter1.text], whi
telist: [filter2.text]}); |
250 | 257 |
251 subscription.disabled = true; | 258 subscription.disabled = true; |
252 checkKnownFilters(test, "disable subscription", {blacklist: [filter1.text]}); | 259 checkKnownFilters(test, "disable subscription", {blacklist: [filter1.text]}); |
253 | 260 |
254 FilterStorage.addFilter(filter2); | 261 filterStorage.addFilter(filter2); |
255 checkKnownFilters(test, "add filter2", {blacklist: [filter1.text], whitelist:
[filter2.text]}); | 262 checkKnownFilters(test, "add filter2", {blacklist: [filter1.text], whitelist:
[filter2.text]}); |
256 | 263 |
257 FilterStorage.removeFilter(filter2); | 264 filterStorage.removeFilter(filter2); |
258 checkKnownFilters(test, "remove filter2", {blacklist: [filter1.text]}); | 265 checkKnownFilters(test, "remove filter2", {blacklist: [filter1.text]}); |
259 | 266 |
260 subscription.disabled = false; | 267 subscription.disabled = false; |
261 checkKnownFilters(test, "enable subscription", {blacklist: [filter1.text], whi
telist: [filter2.text]}); | 268 checkKnownFilters(test, "enable subscription", {blacklist: [filter1.text], whi
telist: [filter2.text]}); |
262 | 269 |
263 FilterStorage.removeSubscription(subscription); | 270 filterStorage.removeSubscription(subscription); |
264 checkKnownFilters(test, "remove subscription", {blacklist: [filter1.text]}); | 271 checkKnownFilters(test, "remove subscription", {blacklist: [filter1.text]}); |
265 | 272 |
266 test.done(); | 273 test.done(); |
267 }; | 274 }; |
268 | 275 |
269 exports.testFilterGroupOperations = function(test) | 276 exports.testFilterGroupOperations = function(test) |
270 { | 277 { |
271 let filter1 = Filter.fromText("filter1"); | 278 let filter1 = Filter.fromText("filter1"); |
272 let filter2 = Filter.fromText("@@filter2"); | 279 let filter2 = Filter.fromText("@@filter2"); |
273 let filter3 = Filter.fromText("filter3"); | 280 let filter3 = Filter.fromText("filter3"); |
274 let filter4 = Filter.fromText("@@filter4"); | 281 let filter4 = Filter.fromText("@@filter4"); |
275 let filter5 = Filter.fromText("!filter5"); | 282 let filter5 = Filter.fromText("!filter5"); |
276 | 283 |
277 let subscription = Subscription.fromURL("http://test1/"); | 284 let subscription = Subscription.fromURL("http://test1/"); |
278 subscription.filters = [filter1, filter2]; | 285 subscription.filters = [filter1, filter2]; |
279 | 286 |
280 FilterStorage.addSubscription(subscription); | 287 filterStorage.addSubscription(subscription); |
281 FilterStorage.addFilter(filter1); | 288 filterStorage.addFilter(filter1); |
282 checkKnownFilters(test, "initial setup", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 289 checkKnownFilters(test, "initial setup", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
283 | 290 |
284 let subscription2 = Subscription.fromURL("~fl~"); | 291 let subscription2 = Subscription.fromURL("~fl~"); |
285 subscription2.disabled = true; | 292 subscription2.disabled = true; |
286 checkKnownFilters(test, "disable blocking filters", {blacklist: [filter1.text]
, whitelist: [filter2.text]}); | 293 checkKnownFilters(test, "disable blocking filters", {blacklist: [filter1.text]
, whitelist: [filter2.text]}); |
287 | 294 |
288 FilterStorage.removeSubscription(subscription); | 295 filterStorage.removeSubscription(subscription); |
289 checkKnownFilters(test, "remove subscription", {}); | 296 checkKnownFilters(test, "remove subscription", {}); |
290 | 297 |
291 subscription2.disabled = false; | 298 subscription2.disabled = false; |
292 checkKnownFilters(test, "enable blocking filters", {blacklist: [filter1.text]}
); | 299 checkKnownFilters(test, "enable blocking filters", {blacklist: [filter1.text]}
); |
293 | 300 |
294 let subscription3 = Subscription.fromURL("~wl~"); | 301 let subscription3 = Subscription.fromURL("~wl~"); |
295 subscription3.disabled = true; | 302 subscription3.disabled = true; |
296 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text]}
); | 303 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text]}
); |
297 | 304 |
298 FilterStorage.addFilter(filter2); | 305 filterStorage.addFilter(filter2); |
299 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 306 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
300 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); | 307 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); |
301 test.ok([...filter2.subscriptions()][0] instanceof SpecialSubscription, "@@fil
ter2 added to a new filter group"); | 308 test.ok([...filter2.subscriptions()][0] instanceof SpecialSubscription, "@@fil
ter2 added to a new filter group"); |
302 test.ok([...filter2.subscriptions()][0] != subscription3, "@@filter2 filter gr
oup is not the disabled exceptions group"); | 309 test.ok([...filter2.subscriptions()][0] != subscription3, "@@filter2 filter gr
oup is not the disabled exceptions group"); |
303 | 310 |
304 subscription3.disabled = false; | 311 subscription3.disabled = false; |
305 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 312 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
306 | 313 |
307 FilterStorage.removeFilter(filter2); | 314 filterStorage.removeFilter(filter2); |
308 FilterStorage.addFilter(filter2); | 315 filterStorage.addFilter(filter2); |
309 checkKnownFilters(test, "re-add @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text]}); | 316 checkKnownFilters(test, "re-add @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text]}); |
310 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); | 317 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); |
311 test.ok([...filter2.subscriptions()][0] == subscription3, "@@filter2 added to
the default exceptions group"); | 318 test.ok([...filter2.subscriptions()][0] == subscription3, "@@filter2 added to
the default exceptions group"); |
312 | 319 |
313 let subscription4 = Subscription.fromURL("http://test/"); | 320 let subscription4 = Subscription.fromURL("http://test/"); |
314 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter4, filt
er5]); | 321 filterStorage.updateSubscriptionFilters(subscription4, [filter3, filter4, filt
er5]); |
315 checkKnownFilters(test, "update subscription not in the list yet", {blacklist:
[filter1.text], whitelist: [filter2.text]}); | 322 checkKnownFilters(test, "update subscription not in the list yet", {blacklist:
[filter1.text], whitelist: [filter2.text]}); |
316 | 323 |
317 FilterStorage.addSubscription(subscription4); | 324 filterStorage.addSubscription(subscription4); |
318 checkKnownFilters(test, "add subscription to the list", {blacklist: [filter1.t
ext, filter3.text], whitelist: [filter2.text, filter4.text]}); | 325 checkKnownFilters(test, "add subscription to the list", {blacklist: [filter1.t
ext, filter3.text], whitelist: [filter2.text, filter4.text]}); |
319 | 326 |
320 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter2, filt
er5]); | 327 filterStorage.updateSubscriptionFilters(subscription4, [filter3, filter2, filt
er5]); |
321 checkKnownFilters(test, "update subscription while in the list", {blacklist: [
filter1.text, filter3.text], whitelist: [filter2.text]}); | 328 checkKnownFilters(test, "update subscription while in the list", {blacklist: [
filter1.text, filter3.text], whitelist: [filter2.text]}); |
322 | 329 |
323 subscription3.disabled = true; | 330 subscription3.disabled = true; |
324 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text,
filter3.text], whitelist: [filter2.text]}); | 331 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text,
filter3.text], whitelist: [filter2.text]}); |
325 | 332 |
326 FilterStorage.removeSubscription(subscription4); | 333 filterStorage.removeSubscription(subscription4); |
327 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); | 334 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); |
328 | 335 |
329 subscription3.disabled = false; | 336 subscription3.disabled = false; |
330 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 337 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
331 | 338 |
332 test.done(); | 339 test.done(); |
333 }; | 340 }; |
334 | 341 |
335 exports.testSnippetFilters = function(test) | 342 exports.testSnippetFilters = function(test) |
336 { | 343 { |
337 let filter1 = Filter.fromText("example.com#$#filter1"); | 344 let filter1 = Filter.fromText("example.com#$#filter1"); |
338 let filter2 = Filter.fromText("example.com#$#filter2"); | 345 let filter2 = Filter.fromText("example.com#$#filter2"); |
339 let filter3 = Filter.fromText("example.com#$#filter3"); | 346 let filter3 = Filter.fromText("example.com#$#filter3"); |
340 | 347 |
341 let subscription1 = Subscription.fromURL("http://test1/"); | 348 let subscription1 = Subscription.fromURL("http://test1/"); |
342 subscription1.filters = [filter1, filter2]; | 349 subscription1.filters = [filter1, filter2]; |
343 | 350 |
344 FilterStorage.addSubscription(subscription1); | 351 filterStorage.addSubscription(subscription1); |
345 checkKnownFilters(test, "add subscription with filter1 and filter2", {}); | 352 checkKnownFilters(test, "add subscription with filter1 and filter2", {}); |
346 | 353 |
347 let subscription2 = Subscription.fromURL("http://test2/"); | 354 let subscription2 = Subscription.fromURL("http://test2/"); |
348 subscription2.type = "circumvention"; | 355 subscription2.type = "circumvention"; |
349 subscription2.filters = [filter1]; | 356 subscription2.filters = [filter1]; |
350 | 357 |
351 FilterStorage.addSubscription(subscription2); | 358 filterStorage.addSubscription(subscription2); |
352 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); | 359 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); |
353 | 360 |
354 let subscription3 = Subscription.fromURL("~foo"); | 361 let subscription3 = Subscription.fromURL("~foo"); |
355 subscription3.filters = [filter2]; | 362 subscription3.filters = [filter2]; |
356 | 363 |
357 FilterStorage.addSubscription(subscription3); | 364 filterStorage.addSubscription(subscription3); |
358 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); | 365 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); |
359 | 366 |
360 let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockpl
us.org/abp-filters-anti-cv.txt"); | 367 let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockpl
us.org/abp-filters-anti-cv.txt"); |
361 subscription4.filters = [filter3]; | 368 subscription4.filters = [filter3]; |
362 | 369 |
363 FilterStorage.addSubscription(subscription4); | 370 filterStorage.addSubscription(subscription4); |
364 checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3"
, {snippets: [filter1.text, filter2.text, filter3.text]}); | 371 checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3"
, {snippets: [filter1.text, filter2.text, filter3.text]}); |
365 | 372 |
366 test.done(); | 373 test.done(); |
367 }; | 374 }; |
LEFT | RIGHT |