Merge branch 'MDL-76207-400' of https://github.com/andrewnicols/moodle …

…into MOODLE_400_STABLE

lib/tests/behat/behat_general.php

@@ -187,6 +187,22 @@ function($context) use ($name){
         );
     }
 
+    /**
+     * Switches to a second window.
+     *
+     * @Given /^I switch to a second window$/
+     * @throws DriverException If there aren't exactly 2 windows open.
+     */
+    public function switch_to_second_window() {
+        $names = $this->getSession()->getWindowNames();
+
+        if (count($names) !== 2) {
+            throw new DriverException('Expected to see 2 windows open, found ' . count($names));
+        }
+
+        $this->getSession()->switchToWindow($names[1]);
+    }
+
     /**
      * Switches to the main Moodle frame.
      *

mod/h5pactivity/tests/behat/contentbank_link.feature

@@ -28,7 +28,7 @@ Feature: Content bank link in the activity settings form
     And I add a "H5P" to section "1"
     Then I should see "Use the content bank (opens in new window) to manage your H5P files"
     And I click on "content bank (opens in new window)" "link" in the "General" "fieldset"
-    And I switch to the browser tab opened by the app
+    And I switch to a second window
     And I should see "Content bank" in the "page-content" "region"
     And I should see "filltheblanks.h5p" in the "page-content" "region"
     And I close all opened windows