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 14 matching lines...) Expand all Loading... |
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 let ElemHideException = null; | 28 let ElemHideException = null; |
29 | 29 |
30 exports.setUp = function(callback) | 30 exports.setUp = function(callback) |
31 { | 31 { |
32 sandboxedRequire = createSandbox({ | 32 sandboxedRequire = createSandbox({ |
33 extraExports: { | 33 extraExports: { |
34 elemHide: ["knownFilters"], | 34 elemHide: ["knownFilters"], |
35 elemHideEmulation: ["filters"] | 35 elemHideEmulation: ["filters"], |
| 36 snippets: ["filters"] |
36 } | 37 } |
37 }); | 38 }); |
38 | 39 |
39 // 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 |
40 // noticed, even though we don't directly use the module here. | 41 // noticed, even though we don't directly use the module here. |
41 sandboxedRequire("../lib/filterListener"); | 42 sandboxedRequire("../lib/filterListener"); |
42 | 43 |
43 ( | 44 ( |
44 {FilterStorage} = sandboxedRequire("../lib/filterStorage"), | 45 {FilterStorage} = sandboxedRequire("../lib/filterStorage"), |
45 {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionC
lasses"), | 46 {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionC
lasses"), |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 result.elemhideexception.push(filter.text); | 88 result.elemhideexception.push(filter.text); |
88 else | 89 else |
89 result.elemhide.push(filter.text); | 90 result.elemhide.push(filter.text); |
90 } | 91 } |
91 | 92 |
92 let elemHideEmulation = sandboxedRequire("../lib/elemHideEmulation"); | 93 let elemHideEmulation = sandboxedRequire("../lib/elemHideEmulation"); |
93 result.elemhideemulation = []; | 94 result.elemhideemulation = []; |
94 for (let filterText of elemHideEmulation.filters) | 95 for (let filterText of elemHideEmulation.filters) |
95 result.elemhideemulation.push(filterText); | 96 result.elemhideemulation.push(filterText); |
96 | 97 |
| 98 let snippets = sandboxedRequire("../lib/snippets"); |
| 99 result.snippets = []; |
| 100 for (let filterText of snippets.filters) |
| 101 result.snippets.push(filterText); |
| 102 |
97 let types = ["blacklist", "whitelist", "elemhide", "elemhideexception", | 103 let types = ["blacklist", "whitelist", "elemhide", "elemhideexception", |
98 "elemhideemulation"]; | 104 "elemhideemulation", "snippets"]; |
99 for (let type of types) | 105 for (let type of types) |
100 { | 106 { |
101 if (!(type in expected)) | 107 if (!(type in expected)) |
102 expected[type] = []; | 108 expected[type] = []; |
103 else | 109 else |
104 expected[type].sort(); | 110 expected[type].sort(); |
105 result[type].sort(); | 111 result[type].sort(); |
106 } | 112 } |
107 | 113 |
108 test.deepEqual(result, expected, text); | 114 test.deepEqual(result, expected, text); |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 exports.testFilterSubscriptionOperations = function(test) | 196 exports.testFilterSubscriptionOperations = function(test) |
191 { | 197 { |
192 let filter1 = Filter.fromText("filter1"); | 198 let filter1 = Filter.fromText("filter1"); |
193 let filter2 = Filter.fromText("@@filter2"); | 199 let filter2 = Filter.fromText("@@filter2"); |
194 filter2.disabled = true; | 200 filter2.disabled = true; |
195 let filter3 = Filter.fromText("##filter3"); | 201 let filter3 = Filter.fromText("##filter3"); |
196 let filter4 = Filter.fromText("!filter4"); | 202 let filter4 = Filter.fromText("!filter4"); |
197 let filter5 = Filter.fromText("#@#filter5"); | 203 let filter5 = Filter.fromText("#@#filter5"); |
198 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); | 204 let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)"); |
199 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); | 205 let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']"); |
| 206 let filter8 = Filter.fromText("example.com#$#filter8"); |
200 | 207 |
201 let subscription = Subscription.fromURL("http://test1/"); | 208 let subscription = Subscription.fromURL("http://test1/"); |
202 subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6,
filter7]; | 209 subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6,
filter7, filter8]; |
203 | 210 |
204 FilterStorage.addSubscription(subscription); | 211 FilterStorage.addSubscription(subscription); |
205 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 // The snippet filter is not added because this is not a circumvention list. |
| 213 checkKnownFilters(test, "add subscription with filter1, @@filter2, ##filter3,
!filter4, #@#filter5, example.com#?#:-abp-properties(filter6), example.com#@#[-a
bp-properties='filter7'], example.com#$#filter8", {blacklist: [filter1.text], el
emhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhid
eemulation: [filter6.text], snippets: []}); |
206 | 214 |
207 filter2.disabled = false; | 215 filter2.disabled = false; |
208 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); | 216 checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitel
ist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text,
filter7.text], elemhideemulation: [filter6.text]}); |
209 | 217 |
210 FilterStorage.addFilter(filter1); | 218 FilterStorage.addFilter(filter1); |
211 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); | 219 checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist:
[filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filt
er7.text], elemhideemulation: [filter6.text]}); |
212 | 220 |
213 FilterStorage.updateSubscriptionFilters(subscription, [filter4]); | 221 subscription.type = "circumvention"; |
214 checkKnownFilters(test, "change subscription filters to filter4", {blacklist:
[filter1.text]}); | 222 |
| 223 FilterStorage.updateSubscriptionFilters(subscription, [filter4, filter8]); |
| 224 // Now the subscription type is "circumvention" so the snippet filter gets |
| 225 // added. |
| 226 checkKnownFilters(test, "change subscription filters to filter4 and filter8",
{blacklist: [filter1.text], snippets: [filter8.text]}); |
| 227 |
| 228 filter8.disabled = true; |
215 | 229 |
216 FilterStorage.removeFilter(filter1); | 230 FilterStorage.removeFilter(filter1); |
217 checkKnownFilters(test, "remove filter1", {}); | 231 checkKnownFilters(test, "remove filter1", {}); |
218 | 232 |
219 FilterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]); | 233 FilterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]); |
220 checkKnownFilters(test, "change subscription filters to filter1, filter2", {bl
acklist: [filter1.text], whitelist: [filter2.text]}); | 234 checkKnownFilters(test, "change subscription filters to filter1, filter2", {bl
acklist: [filter1.text], whitelist: [filter2.text]}); |
221 | 235 |
222 filter1.disabled = true; | 236 filter1.disabled = true; |
223 checkKnownFilters(test, "disable filter1", {whitelist: [filter2.text]}); | 237 checkKnownFilters(test, "disable filter1", {whitelist: [filter2.text]}); |
224 filter2.disabled = true; | 238 filter2.disabled = true; |
(...skipping 93 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]}); | 332 checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text,
filter3.text], whitelist: [filter2.text]}); |
319 | 333 |
320 FilterStorage.removeSubscription(subscription4); | 334 FilterStorage.removeSubscription(subscription4); |
321 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); | 335 checkKnownFilters(test, "remove subscription from the list", {blacklist: [filt
er1.text]}); |
322 | 336 |
323 subscription3.disabled = false; | 337 subscription3.disabled = false; |
324 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); | 338 checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text],
whitelist: [filter2.text]}); |
325 | 339 |
326 test.done(); | 340 test.done(); |
327 }; | 341 }; |
OLD | NEW |