Issue 6699 - Support the "circumvention" filter list as default subscription

qunit/tests/subscriptionInit.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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";
 
 {
   let {chooseFilterSubscriptions} = require("../../lib/subscriptionInit");
 
   QUnit.module("Subscription", {
     setup()
     {
       let {Utils} = require("../../lib/utils");
-      Object.defineProperty(Utils, "appLocale", {value: "en", enumerable: true});
-    },
-
-    teardown()
-    {
-      // TODO restore appLocale
+      Object.defineProperty(Utils, "appLocale",
+                            {value: "en", enumerable: true});
     }
   });
 
 
   test("Choosing filter subscriptions", assert =>
   {
     let done = assert.async();
     fetch("subscriptions.xml")
       .then(response => response.text())

[Manish Jethani, 2018/06/13 13:45:39]

This appears not to be mentioned in the style guide, but I think the convention
is to align the `.then` with the `fetch` above it.

[hub, 2018/06/13 16:33:37]

That's how it is done in `subscriptionInit.js`. Given that it is a continuation
it is indented. The linter say so.

[Manish Jethani, 2018/06/13 16:53:09]

What I see in most places is this:

  func(
    param
  ).then(() => {})
   .then(() => {});

Since here func opens and closes on the same line, the `.then` would ideally be
aligned with the first character, like so:

  func(param)
  .then(() => {})
  .then(() => {});

When we break lines we continue the "expression" in the same column where it
started:

  let foo = 1 + 2 + 3
            4 + 5 + 6;
  let bar = one.two.three
            .four.five.six();

The linter doesn't care about this because we actually disabled some of these
rules for ESLint 4, if I remember correctly. But is the convention we are
following in general (so I hope).

Anyway, I can see some inconsistencies in this file, I don't care if it is all
fixed as a separate patch.

[hub, 2018/06/13 21:58:18]

I just followed `lib/subscriptionInit.js:l202`

Other occurence `lib/io.js:109`

[Manish Jethani, 2018/06/14 05:07:33]

Acknowledged.

       .then(text =>
       {
         let doc = new DOMParser().parseFromString(text, "application/xml");
         let nodes = doc.getElementsByTagName("subscription");
 
         let subs = chooseFilterSubscriptions(nodes);
         assert.ok(subs);
-        assert.ok(subs.cv);
+        assert.ok(subs.circumvention);
         assert.ok(subs.ads);
 
-        assert.equal(subs.cv.getAttribute("prefixes"), "en");
-        assert.equal(subs.cv.getAttribute("type"), "cv");
+        assert.equal(subs.circumvention.getAttribute("prefixes"),
+                     "de,en,en-US");
+        assert.equal(subs.circumvention.getAttribute("type"), "circumvention");
         assert.equal(subs.ads.getAttribute("prefixes"), "en");
         assert.equal(subs.ads.getAttribute("type"), "ads");
 
         done();
       })
       .catch(() =>
       {
         assert.ok(false);
 
         done();
       });
   });
 }