Noissue - Make subscribe link tests more reliable by waiting for options page to be ready

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/en/";
 
 const assert = require("assert");
 const Jimp = require("jimp");
-const {By} = require("selenium-webdriver");
+const {By, until} = 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(
     callback,
     err => Promise.resolve(callback()).then(() =>
       Promise.reject(err)
     )
@@ skipping 12 matching lines @@
     () => 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
-      ), 1000
+      ), 3000
     )
   ).then(handles =>
     closeWindow(driver, handles[2], handles[1], () =>
-      driver.switchTo().frame(0).then(() =>
-        driver.findElement(By.id("dialog-content-predefined"))
+      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");
 
@@ skipping 171 matching lines @@
                 title
               )
             );
           });
         }
         return p2;
       });
     return p1;
   });
 });