Noissue - Moved subscription link test to separate test case

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 30 matching lines @@
     driver.switchTo().window(goTo).then(() =>
       promiseFinally(
         new Promise(resolve => resolve(callback && callback())),
         () => driver.close()
       )
     ),
     () => driver.switchTo().window(returnTo)
   );
 }
 
-function testSubscribeLink(driver)
-{
-  return driver.findElement(By.id("subscribe-button")).click().then(() =>
-    driver.wait(() =>
-      driver.getAllWindowHandles().then(handles =>
-        handles.length > 2 ? handles : null
-      ), 3000
-    )
-  ).then(handles =>
-    closeWindow(driver, handles[2], handles[1], () =>
-      driver.wait(until.ableToSwitchToFrame(0), 1000).then(() =>
-        driver.wait(until.elementLocated(By.id("dialog-content-predefined")),
-                    1000)
-      ).then(dialog =>
-        Promise.all([
-          dialog.isDisplayed(),
-          dialog.findElement(By.css("h3")).getText()
-        ]).then(([displayed, title]) =>
-        {
-          assert.ok(displayed, "subscribe link: dialog shown");
-          assert.equal(title, "ABP Testcase Subscription",
-                       "subscribe link: title shown in dialog");
-
-          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 == "${TEST_PAGES_URL}abp-testcase-subscription.txt"
-            )
-          ).then(
-            res => callback([res, null]),
-            err => callback([null, err])
-          );
-        `)
-      ).then(([added, err]) =>
-      {
-        if (err)
-          throw err;
-        assert.ok(added, "subscribe link: subscription added");
-      })
-    )
-  );
-}
-
 function imageFromBase64(s)
 {
   return Jimp.read(Buffer.from(s, "base64"));
 }
 
 function takeScreenshot(element)
 {
   return element.takeScreenshot().then(
     imageFromBase64,
 
@@ skipping 38 matching lines @@
 }
 
 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")))
   ).then(urls =>
   {
-    let p1 = testSubscribeLink(this.driver);
+    let p1 = Promise.resolve();
     for (let url of urls)
       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]) =>
@@ skipping 76 matching lines @@
                 title
               )
             );
           });
         }
         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(() =>
+      this.driver.getAllWindowHandles().then(handles =>
+        handles.length > 2 ? handles : null
+      ), 3000
+    )
+  ).then(handles =>
+    closeWindow(this.driver, handles[2], handles[1], () =>
+      this.driver.wait(until.ableToSwitchToFrame(0), 1000).then(() =>
+        this.driver.wait(
+          until.elementLocated(By.id("dialog-content-predefined")), 1000
+        )
+      ).then(dialog =>
+        Promise.all([
+          dialog.isDisplayed(),
+          dialog.findElement(By.css("h3")).getText()
+        ]).then(([displayed, title]) =>
+        {
+          assert.ok(displayed, "dialog shown");
+          assert.equal(title, "ABP Testcase Subscription", "title matches");
+
+          return dialog.findElement(By.css("button")).click();
+        })
+      ).then(() =>
+        this.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 == "${TEST_PAGES_URL}abp-testcase-subscription.txt"
+            )
+          ).then(
+            res => callback([res, null]),
+            err => callback([null, err])
+          );
+        `)
+      ).then(([added, err]) =>
+      {
+        if (err)
+          throw err;
+        assert.ok(added, "subscription added");
+      })
+    )
+  );
+});