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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 else | 103 else |
104 expected[type].sort(); | 104 expected[type].sort(); |
105 result[type].sort(); | 105 result[type].sort(); |
106 } | 106 } |
107 | 107 |
108 test.deepEqual(result, expected, text); | 108 test.deepEqual(result, expected, text); |
109 } | 109 } |
110 | 110 |
111 exports.testAddingAndRemovingFilters = function(test) | 111 exports.testAddingAndRemovingFilters = function(test) |
112 { | 112 { |
| 113 let filter0 = Filter.fromText("filter0"); |
113 let filter1 = Filter.fromText("filter1"); | 114 let filter1 = Filter.fromText("filter1"); |
114 let filter2 = Filter.fromText("@@filter2"); | 115 let filter2 = Filter.fromText("@@filter2"); |
115 let filter3 = Filter.fromText("##filter3"); | 116 let filter3 = Filter.fromText("##filter3"); |
116 let filter4 = Filter.fromText("!filter4"); | 117 let filter4 = Filter.fromText("!filter4"); |
117 let filter5 = Filter.fromText("#@#filter5"); | 118 let filter5 = Filter.fromText("#@#filter5"); |
118 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6')"); | 119 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6')"); |
119 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); | 120 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); |
120 | 121 |
| 122 filter0.needsTrust = true; |
| 123 FilterStorage.addFilter(filter0); |
| 124 checkKnownFilters(test, "add filter0", {}); |
| 125 |
121 FilterStorage.addFilter(filter1); | 126 FilterStorage.addFilter(filter1); |
122 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text]}); | 127 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text]}); |
123 FilterStorage.addFilter(filter2); | 128 FilterStorage.addFilter(filter2); |
124 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); | 129 checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist
: [filter2.text]}); |
125 FilterStorage.addFilter(filter3); | 130 FilterStorage.addFilter(filter3); |
126 checkKnownFilters(test, "add ##filter3", {blacklist: [filter1.text], whitelist
: [filter2.text], elemhide: [filter3.text]}); | 131 checkKnownFilters(test, "add ##filter3", {blacklist: [filter1.text], whitelist
: [filter2.text], elemhide: [filter3.text]}); |
127 FilterStorage.addFilter(filter4); | 132 FilterStorage.addFilter(filter4); |
128 checkKnownFilters(test, "add !filter4", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text]}); | 133 checkKnownFilters(test, "add !filter4", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text]}); |
129 FilterStorage.addFilter(filter5); | 134 FilterStorage.addFilter(filter5); |
130 checkKnownFilters(test, "add #@#filter5", {blacklist: [filter1.text], whitelis
t: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]})
; | 135 checkKnownFilters(test, "add #@#filter5", {blacklist: [filter1.text], whitelis
t: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]})
; |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text,
filter3.text], whitelist: [filter2.text]}); | 323 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text,
filter3.text], whitelist: [filter2.text]}); |
319 | 324 |
320 FilterStorage.removeSubscription(subscription4); | 325 FilterStorage.removeSubscription(subscription4); |
321 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); | 326 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); |
322 | 327 |
323 subscription3.disabled = false; | 328 subscription3.disabled = false; |
324 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 329 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
325 | 330 |
326 test.done(); | 331 test.done(); |
327 }; | 332 }; |
OLD | NEW |