Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd

qunit/common.js

Index: qunit/common.js
===================================================================
--- a/qunit/common.js
+++ b/qunit/common.js
@@ -12,27 +12,27 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
+const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses");
 const {Filter} = require("../adblockpluscore/lib/filterClasses");
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {ElemHide} = require("../adblockpluscore/lib/elemHide");
 const {Prefs} = require("../lib/prefs");
 
 function prepareFilterComponents(keepListeners)
 {
-  FilterStorage.subscriptions = [];
-  FilterStorage.knownSubscriptions = Object.create(null);
+  filterStorage.subscriptions = [];

[Manish Jethani, 2018/12/20 17:21:40]

Regarding this, I notice that `filterStorage.subscriptions` is no longer an
array. But nor is `Subscription.knownFilters` a plain object. It seems the qunit
tests are out of sync with adblockpluscore and have been so for a while.
Meanwhile the tests still pass (!).

In my opinion, let's file a separate issue to get the qunit tests on par with
the current state of adblockpluscore.

[kzar, 2018/12/20 17:50:46]

If it's new since the dependency update that `filterStorage.subscriptions` is no
longer an array and that `Subscription.knownFilters` is no longer a plain
Object, then we should fix the tests now with the dependency update.

Looking at it, `filterStorage.subscriptions` has changed with the dependency
update, so we should correct this now. `Subscription.knownFilters` changed
previously, so we should have already adjusted the tests for that previously. I
don't mind if we fix the use of `Subscription.knownFilters` before the
dependency update, or as a part of it now.

[Jon Sonesen, 2018/12/20 18:22:14]

I am actually working on this, I had noticed it as of the last upload I forgot
to write a comment though.

+  filterStorage.knownSubscriptions = Object.create(null);
   Subscription.knownSubscriptions = Object.create(null);
   Filter.knownFilters = Object.create(null);
 
   defaultMatcher.clear();
   ElemHide.clear();
 }
 
 function restoreFilterComponents()