Noissue - Adapt for test pages changes running circumvention tests

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
@@ skipping 77 matching lines @@
   ).then(sections => sections.filter(
     ([title, demo, filters]) => title && demo && filters.length > 0
   ));
 }
 
 it("test pages", function()
 {
   return this.driver.navigate().to(TEST_PAGES_URL).then(() =>
     this.driver.findElements(By.css(".site-pagelist a"))
   ).then(elements =>
-    Promise.all(elements.map(elem => elem.getAttribute("href")))
+    Promise.all(elements.map(elem => Promise.all([elem.getAttribute("href"),
+                                                  elem.getText()])))

[Sebastian Noack, 2019/01/17 08:17:13]

Previously, we were getting the page title from the first headline on the test
case page, this however doesn't work reliably for the circumvention test pages.
So we use the link label in the overview now instead. As a side effect, we can
bail earlier for test cases that we want to skip now.

   ).then(urls =>
   {
     let p1 = Promise.resolve();
-    for (let url of urls)
+    for (let [url, pageTitle] of urls)
+    {
+      let browser = this.test.parent.title.replace(/\s.*$/, "");
+      if (// https://issues.adblockplus.org/ticket/6917
+          pageTitle == "$subdocument" && browser == "Firefox" ||
+          // Chromium doesn't support Flash
+          pageTitle.startsWith("$object") && browser == "Chromium" ||
+          // Chromium 63 doesn't have user stylesheets (required to
+          // overrule inline styles) and doesn't run content scripts
+          // in dynamically written documents.
+          this.test.parent.title == "Chromium (oldest)" &&
+          (pageTitle == "Inline style !important" ||
+           pageTitle == "Anonymous iframe document.write()"))
+        continue;
+
       p1 = p1.then(() =>
         this.driver.navigate().to(url)
       ).then(() =>
         Promise.all([
           getSections(this.driver),
-          this.driver.findElement(By.css("h2")).getAttribute("textContent"),
           this.driver.executeScript("document.body.classList.add('expected');")
         ])
-      ).then(([sections, pageTitle]) =>
+      ).then(([sections]) =>
         Promise.all(sections.map(([title, demo, filters]) =>
           Promise.all([
             title.getAttribute("textContent").then(testTitle =>
               `${pageTitle.trim()} - ${testTitle.trim()}`
             ),
             takeScreenshot(demo),
             Promise.all(filters.map(elem => elem.getAttribute("textContent")))
           ])
         ))
       ).then(testCases =>
       {
         let p2 = Promise.resolve();
         for (let i = 0; i < testCases.length; i++)
         {
           let [title, expectedScreenshot, filters] = testCases[i];
-          let browser = this.test.parent.title.replace(/\s.*$/, "");
-
-          if (// https://issues.adblockplus.org/ticket/6917
-              title == "$subdocument - Test case" && browser == "Firefox" ||
-              // Chromium doesn't support Flash
-              /^\$object(-subrequest)? /.test(title) && browser == "Chromium")
-            continue;
 
           p2 = p2.then(() =>
             this.driver.navigate().to(this.origin + "/options.html")
           ).then(() =>
             this.driver.executeAsyncScript(`
               let filters = arguments[0];
               let callback = arguments[arguments.length - 1];
               browser.runtime.sendMessage({type: "subscriptions.get",
                                            downloadable: true,
                                            special: true}).then(subs =>
               {
                 for (let subscription of subs)
                   browser.runtime.sendMessage({type: "subscriptions.remove",
                                                url: subscription.url});
                 return browser.runtime.sendMessage({type: "filters.importRaw",
                                                     text: filters});
               }).then(() => callback(), callback);
             `, filters.join("\n"))
           ).then(error =>
           {
             if (error)
               throw error;
             return this.driver.navigate().to(url);
           }).then(() =>
           {
-            if (title.startsWith("$popup "))
+            if (pageTitle.startsWith("$popup"))
             {
               return getSections(this.driver).then(sections =>
                 sections[i][1].findElement(By.css("a[href],button")).click()
               ).then(() =>
                 this.driver.sleep(100)
               ).then(() =>
                 this.driver.getAllWindowHandles()
               ).then(handles =>
               {
-                if (title.startsWith("$popup Exception -"))
+                if (pageTitle == "$popup - Exception")
                 {
                   assert.equal(handles.length, 3, title);
                   return closeWindow(this.driver, handles[2], handles[1]);
                 }
 
                 assert.equal(handles.length, 2, title);
               });
             }
 
             let checkTestCase = () =>
@@ skipping 10 matching lines @@
             // Sometimes on Firefox there is a delay until the added
             // filters become effective. So if the test case fails once,
             // we reload the page and try once again.
             return checkTestCase().catch(() =>
               this.driver.navigate().refresh().then(checkTestCase)
             );
           });
         }
         return p2;
       });
+    }
     return p1;
   });
 });
 
 it("subscribe link", function()
 {
   return this.driver.navigate().to(TEST_PAGES_URL).then(() =>
     this.driver.findElement(By.id("subscribe-button")).click()
   ).then(() =>
     this.driver.wait(() =>
@@ skipping 34 matching lines @@
         `)
       ).then(([added, err]) =>
       {
         if (err)
           throw err;
         assert.ok(added, "subscription added");
       })
     )
   );
 });