| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 113   test.done(); | 113   test.done(); | 
| 114 }; | 114 }; | 
| 115 | 115 | 
| 116 exports.testSubscriptionDefaults = function(test) | 116 exports.testSubscriptionDefaults = function(test) | 
| 117 { | 117 { | 
| 118   let tests = [ | 118   let tests = [ | 
| 119     ["blocking", "test"], | 119     ["blocking", "test"], | 
| 120     ["whitelist", "@@test"], | 120     ["whitelist", "@@test"], | 
| 121     ["elemhide", "##test"], | 121     ["elemhide", "##test"], | 
| 122     ["elemhide", "#@#test"], | 122     ["elemhide", "#@#test"], | 
| 123     ["elemhide", "foo##[-abp-properties='foo']"], | 123     ["elemhide", "foo##:-abp-properties(foo)"], | 
|  | 124     ["elemhide", "foo#?#:-abp-properties(foo)"], | 
|  | 125     // Invalid elemhide filter. Incorrectly classified as blocking. | 
|  | 126     // See https://issues.adblockplus.org/ticket/6234 | 
|  | 127     ["blocking", "foo#@?#:-abp-properties(foo)"], | 
| 124     ["", "!test"], | 128     ["", "!test"], | 
| 125     ["", "/??/"], | 129     ["", "/??/"], | 
| 126     ["blocking whitelist", "test", "@@test"], | 130     ["blocking whitelist", "test", "@@test"], | 
| 127     ["blocking elemhide", "test", "##test"] | 131     ["blocking elemhide", "test", "##test"] | 
| 128   ]; | 132   ]; | 
| 129 | 133 | 
| 130   for (let [defaults, ...filters] of tests) | 134   for (let [defaults, ...filters] of tests) | 
| 131   { | 135   { | 
| 132     let expected = ["url=~user~" + filters.join("~")]; | 136     let expected = ["url=~user~" + filters.join("~")]; | 
| 133     if (defaults) | 137     if (defaults) | 
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 361     subscription.errors++; | 365     subscription.errors++; | 
| 362   }, ["subscription.errors", "http://example.com/"], "Increasing subscription.er
     rors"); | 366   }, ["subscription.errors", "http://example.com/"], "Increasing subscription.er
     rors"); | 
| 363   checkNotifications(() => | 367   checkNotifications(() => | 
| 364   { | 368   { | 
| 365     subscription.errors = 0; | 369     subscription.errors = 0; | 
| 366   }, ["subscription.errors", "http://example.com/"], "Resetting subscription.err
     ors"); | 370   }, ["subscription.errors", "http://example.com/"], "Resetting subscription.err
     ors"); | 
| 367 | 371 | 
| 368   subscription.delete(); | 372   subscription.delete(); | 
| 369   test.done(); | 373   test.done(); | 
| 370 }; | 374 }; | 
| OLD | NEW | 
|---|