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-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 |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 let filter1 = Filter.fromText("filter1"); | 200 let filter1 = Filter.fromText("filter1"); |
201 let filter2 = Filter.fromText("@@filter2"); | 201 let filter2 = Filter.fromText("@@filter2"); |
202 filter2.disabled = true; | 202 filter2.disabled = true; |
203 let filter3 = Filter.fromText("##filter3"); | 203 let filter3 = Filter.fromText("##filter3"); |
204 let filter4 = Filter.fromText("!filter4"); | 204 let filter4 = Filter.fromText("!filter4"); |
205 let filter5 = Filter.fromText("#@#filter5"); | 205 let filter5 = Filter.fromText("#@#filter5"); |
206 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); | 206 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); |
207 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); | 207 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); |
208 | 208 |
209 let subscription = Subscription.fromURL("http://test1/"); | 209 let subscription = Subscription.fromURL("http://test1/"); |
210 subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6,
filter7]; | 210 subscription.addFilter(filter1); |
| 211 subscription.addFilter(filter2); |
| 212 subscription.addFilter(filter3); |
| 213 subscription.addFilter(filter4); |
| 214 subscription.addFilter(filter5); |
| 215 subscription.addFilter(filter6); |
| 216 subscription.addFilter(filter7); |
211 | 217 |
212 filterStorage.addSubscription(subscription); | 218 filterStorage.addSubscription(subscription); |
213 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]}); | 219 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]}); |
214 | 220 |
215 filter2.disabled = false; | 221 filter2.disabled = false; |
216 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); | 222 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); |
217 | 223 |
218 filterStorage.addFilter(filter1); | 224 filterStorage.addFilter(filter1); |
219 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); | 225 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); |
220 | 226 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 | 276 |
271 exports.testFilterGroupOperations = function(test) | 277 exports.testFilterGroupOperations = function(test) |
272 { | 278 { |
273 let filter1 = Filter.fromText("filter1"); | 279 let filter1 = Filter.fromText("filter1"); |
274 let filter2 = Filter.fromText("@@filter2"); | 280 let filter2 = Filter.fromText("@@filter2"); |
275 let filter3 = Filter.fromText("filter3"); | 281 let filter3 = Filter.fromText("filter3"); |
276 let filter4 = Filter.fromText("@@filter4"); | 282 let filter4 = Filter.fromText("@@filter4"); |
277 let filter5 = Filter.fromText("!filter5"); | 283 let filter5 = Filter.fromText("!filter5"); |
278 | 284 |
279 let subscription = Subscription.fromURL("http://test1/"); | 285 let subscription = Subscription.fromURL("http://test1/"); |
280 subscription.filters = [filter1, filter2]; | 286 subscription.addFilter(filter1); |
| 287 subscription.addFilter(filter2); |
281 | 288 |
282 filterStorage.addSubscription(subscription); | 289 filterStorage.addSubscription(subscription); |
283 filterStorage.addFilter(filter1); | 290 filterStorage.addFilter(filter1); |
284 checkKnownFilters(test, "initial setup", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 291 checkKnownFilters(test, "initial setup", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
285 | 292 |
286 let subscription2 = Subscription.fromURL("~fl~"); | 293 let subscription2 = Subscription.fromURL("~fl~"); |
287 subscription2.disabled = true; | 294 subscription2.disabled = true; |
288 checkKnownFilters(test, "disable blocking filters", {blacklist: [filter1.text]
, whitelist: [filter2.text]}); | 295 checkKnownFilters(test, "disable blocking filters", {blacklist: [filter1.text]
, whitelist: [filter2.text]}); |
289 | 296 |
290 filterStorage.removeSubscription(subscription); | 297 filterStorage.removeSubscription(subscription); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 test.done(); | 341 test.done(); |
335 }; | 342 }; |
336 | 343 |
337 exports.testSnippetFilters = function(test) | 344 exports.testSnippetFilters = function(test) |
338 { | 345 { |
339 let filter1 = Filter.fromText("example.com#$#filter1"); | 346 let filter1 = Filter.fromText("example.com#$#filter1"); |
340 let filter2 = Filter.fromText("example.com#$#filter2"); | 347 let filter2 = Filter.fromText("example.com#$#filter2"); |
341 let filter3 = Filter.fromText("example.com#$#filter3"); | 348 let filter3 = Filter.fromText("example.com#$#filter3"); |
342 | 349 |
343 let subscription1 = Subscription.fromURL("http://test1/"); | 350 let subscription1 = Subscription.fromURL("http://test1/"); |
344 subscription1.filters = [filter1, filter2]; | 351 subscription1.addFilter(filter1); |
| 352 subscription1.addFilter(filter2); |
345 | 353 |
346 filterStorage.addSubscription(subscription1); | 354 filterStorage.addSubscription(subscription1); |
347 checkKnownFilters(test, "add subscription with filter1 and filter2", {}); | 355 checkKnownFilters(test, "add subscription with filter1 and filter2", {}); |
348 | 356 |
349 let subscription2 = Subscription.fromURL("http://test2/"); | 357 let subscription2 = Subscription.fromURL("http://test2/"); |
350 subscription2.type = "circumvention"; | 358 subscription2.type = "circumvention"; |
351 subscription2.filters = [filter1]; | 359 subscription2.addFilter(filter1); |
352 | 360 |
353 filterStorage.addSubscription(subscription2); | 361 filterStorage.addSubscription(subscription2); |
354 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); | 362 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); |
355 | 363 |
356 let subscription3 = Subscription.fromURL("~foo"); | 364 let subscription3 = Subscription.fromURL("~foo"); |
357 subscription3.filters = [filter2]; | 365 subscription3.addFilter(filter2); |
358 | 366 |
359 filterStorage.addSubscription(subscription3); | 367 filterStorage.addSubscription(subscription3); |
360 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); | 368 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); |
361 | 369 |
362 let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockpl
us.org/abp-filters-anti-cv.txt"); | 370 let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockpl
us.org/abp-filters-anti-cv.txt"); |
363 subscription4.filters = [filter3]; | 371 subscription4.addFilter(filter3); |
364 | 372 |
365 filterStorage.addSubscription(subscription4); | 373 filterStorage.addSubscription(subscription4); |
366 checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3"
, {snippets: [filter1.text, filter2.text, filter3.text]}); | 374 checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3"
, {snippets: [filter1.text, filter2.text, filter3.text]}); |
367 | 375 |
368 test.done(); | 376 test.done(); |
369 }; | 377 }; |
OLD | NEW |