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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 | 289 |
290 subscription2.disabled = false; | 290 subscription2.disabled = false; |
291 checkKnownFilters(test, "enable blocking filters", {blacklist: [filter1.text]}
); | 291 checkKnownFilters(test, "enable blocking filters", {blacklist: [filter1.text]}
); |
292 | 292 |
293 let subscription3 = Subscription.fromURL("~wl~"); | 293 let subscription3 = Subscription.fromURL("~wl~"); |
294 subscription3.disabled = true; | 294 subscription3.disabled = true; |
295 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text]}
); | 295 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text]}
); |
296 | 296 |
297 FilterStorage.addFilter(filter2); | 297 FilterStorage.addFilter(filter2); |
298 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 298 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
299 test.equal(filter2.subscriptions.size, 1, "@@filter2.subscription.length"); | 299 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); |
300 test.ok([...filter2.subscriptions][0] instanceof SpecialSubscription, "@@filte
r2 added to a new filter group"); | 300 test.ok([...filter2.subscriptions()][0] instanceof SpecialSubscription, "@@fil
ter2 added to a new filter group"); |
301 test.ok([...filter2.subscriptions][0] != subscription3, "@@filter2 filter grou
p is not the disabled exceptions group"); | 301 test.ok([...filter2.subscriptions()][0] != subscription3, "@@filter2 filter gr
oup is not the disabled exceptions group"); |
302 | 302 |
303 subscription3.disabled = false; | 303 subscription3.disabled = false; |
304 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 304 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
305 | 305 |
306 FilterStorage.removeFilter(filter2); | 306 FilterStorage.removeFilter(filter2); |
307 FilterStorage.addFilter(filter2); | 307 FilterStorage.addFilter(filter2); |
308 checkKnownFilters(test, "re-add @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text]}); | 308 checkKnownFilters(test, "re-add @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text]}); |
309 test.equal(filter2.subscriptions.size, 1, "@@filter2.subscription.length"); | 309 test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount"); |
310 test.ok([...filter2.subscriptions][0] == subscription3, "@@filter2 added to th
e default exceptions group"); | 310 test.ok([...filter2.subscriptions()][0] == subscription3, "@@filter2 added to
the default exceptions group"); |
311 | 311 |
312 let subscription4 = Subscription.fromURL("http://test/"); | 312 let subscription4 = Subscription.fromURL("http://test/"); |
313 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter4, filt
er5]); | 313 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter4, filt
er5]); |
314 checkKnownFilters(test, "update subscription not in the list yet", {blacklist:
[filter1.text], whitelist: [filter2.text]}); | 314 checkKnownFilters(test, "update subscription not in the list yet", {blacklist:
[filter1.text], whitelist: [filter2.text]}); |
315 | 315 |
316 FilterStorage.addSubscription(subscription4); | 316 FilterStorage.addSubscription(subscription4); |
317 checkKnownFilters(test, "add subscription to the list", {blacklist: [filter1.t
ext, filter3.text], whitelist: [filter2.text, filter4.text]}); | 317 checkKnownFilters(test, "add subscription to the list", {blacklist: [filter1.t
ext, filter3.text], whitelist: [filter2.text, filter4.text]}); |
318 | 318 |
319 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter2, filt
er5]); | 319 FilterStorage.updateSubscriptionFilters(subscription4, [filter3, filter2, filt
er5]); |
320 checkKnownFilters(test, "update subscription while in the list", {blacklist: [
filter1.text, filter3.text], whitelist: [filter2.text]}); | 320 checkKnownFilters(test, "update subscription while in the list", {blacklist: [
filter1.text, filter3.text], whitelist: [filter2.text]}); |
(...skipping 29 matching lines...) Expand all Loading... |
350 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); | 350 checkKnownFilters(test, "add subscription of type circumvention with filter1",
{snippets: [filter1.text]}); |
351 | 351 |
352 let subscription3 = Subscription.fromURL("~foo"); | 352 let subscription3 = Subscription.fromURL("~foo"); |
353 subscription3.filters = [filter2]; | 353 subscription3.filters = [filter2]; |
354 | 354 |
355 FilterStorage.addSubscription(subscription3); | 355 FilterStorage.addSubscription(subscription3); |
356 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); | 356 checkKnownFilters(test, "add special subscription with filter2", {snippets: [f
ilter1.text, filter2.text]}); |
357 | 357 |
358 test.done(); | 358 test.done(); |
359 }; | 359 }; |
OLD | NEW |