| 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-2017 eyeo GmbH | 3  * Copyright (C) 2006-2017 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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     ["blocking", "!test"], | 124     ["", "!test"], | 
| 125     ["blocking", "/??/"], | 125     ["", "/??/"], | 
| 126     ["blocking whitelist", "test", "@@test"], | 126     ["blocking whitelist", "test", "@@test"], | 
| 127     ["blocking elemhide", "test", "##test"] | 127     ["blocking elemhide", "test", "##test"] | 
| 128   ]; | 128   ]; | 
| 129 | 129 | 
| 130   for (let [defaults, ...filters] of tests) | 130   for (let [defaults, ...filters] of tests) | 
| 131   { | 131   { | 
| 132     compareSubscription(test, "~user~" + filters.join("~"), ["url=~user~" + filt
     ers.join("~"), "defaults= " + defaults], subscription => | 132     let expected = ["url=~user~" + filters.join("~")]; | 
|  | 133     if (defaults) | 
|  | 134       expected.push("defaults= " + defaults); | 
|  | 135     compareSubscription(test, "~user~" + filters.join("~"), expected, subscripti
     on => | 
| 133     { | 136     { | 
| 134       for (let text of filters) | 137       for (let text of filters) | 
| 135       { | 138       { | 
| 136         let filter = Filter.fromText(text); | 139         let filter = Filter.fromText(text); | 
| 137         subscription.makeDefaultFor(filter); | 140         subscription.makeDefaultFor(filter); | 
| 138         filter.delete(); | 141         filter.delete(); | 
| 139       } | 142       } | 
| 140     }); | 143     }); | 
| 141   } | 144   } | 
| 142   test.done(); | 145   test.done(); | 
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 358     subscription.errors++; | 361     subscription.errors++; | 
| 359   }, ["subscription.errors", "http://example.com/"], "Increasing subscription.er
     rors"); | 362   }, ["subscription.errors", "http://example.com/"], "Increasing subscription.er
     rors"); | 
| 360   checkNotifications(() => | 363   checkNotifications(() => | 
| 361   { | 364   { | 
| 362     subscription.errors = 0; | 365     subscription.errors = 0; | 
| 363   }, ["subscription.errors", "http://example.com/"], "Resetting subscription.err
     os"); | 366   }, ["subscription.errors", "http://example.com/"], "Resetting subscription.err
     os"); | 
| 364 | 367 | 
| 365   subscription.delete(); | 368   subscription.delete(); | 
| 366   test.done(); | 369   test.done(); | 
| 367 }; | 370 }; | 
| OLD | NEW | 
|---|