Noissue - Fixed test pages integration tests after change of subscription URL

test/wrappers/pages.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";
 
-const TEST_PAGES_URL = "https://testpages.adblockplus.org/";
+const TEST_PAGES_URL = "https://testpages.adblockplus.org/en/";

[Sebastian Noack, 2018/09/25 16:12:06]

Today a change landed for the test pages that caused all URLs to be constructed
rather than hard-coded redundantly. As a side effect the subscription URL
changed from http://testpages.adblockplus.org/abp-testcase-subscription.txt to
https://testpages.adblockplus.org/en/abp-testcase-subscription.txt.

 
 const assert = require("assert");
 const Jimp = require("jimp");
 const {By} = require("selenium-webdriver");
 
 // Once we require Node.js >= 10 this should be replaced with
 // the built-in finally() method of the Promise object.
 function promiseFinally(p, callback)
 {
   return p.then(
@@ skipping 41 matching lines @@
 
           return dialog.findElement(By.css("button")).click();
         })
       ).then(() =>
         driver.executeAsyncScript(`
           let callback = arguments[arguments.length - 1];
           browser.runtime.sendMessage({type: "subscriptions.get",
                                        ignoreDisabled: true,
                                        downloadable: true}).then(subs =>
             subs.some(s =>
-              s.url.endsWith("${TEST_PAGES_URL.replace(/^[^:]+/, "")}" +
-                             "abp-testcase-subscription.txt")
+              s.url == "${TEST_PAGES_URL}abp-testcase-subscription.txt"

[Sebastian Noack, 2018/09/25 16:12:06]

This was neccessary before, but no longer, because previously the protocol the
URL in the subscription link used http:// while the test pages themselves were
delivered over https://.

             )
           ).then(
             res => callback([res, null]),
             err => callback([null, err])
           );
         `)
       ).then(([added, err]) =>
       {
         if (err)
           throw err;
@@ skipping 151 matching lines @@
                 title
               )
             );
           });
         }
         return p2;
       });
     return p1;
   });
 });