mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47588' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-10-20 14:30:46 +01:00
commit 11c6debb0a
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tests/behat/behat_general.php
View File

@ -49,6 +49,12 @@ use Behat\Mink\Exception\ExpectationException as ExpectationException,
*/
class behat_general extends behat_base {
/**
* @var string used by {@link switch_to_window()} and
* {@link switch_to_the_main_window()} to work-around a Chrome browser issue.
*/
const MAIN_WINDOW_NAME = '__moodle_behat_main_window_name';
/**
* Opens Moodle homepage.
*
@ -157,6 +163,15 @@ class behat_general extends behat_base {
* @param string $windowname
*/
public function switch_to_window($windowname) {
// In Behat, some browsers (e.g. Chrome) are unable to switch to a
// window without a name, and by default the main browser window does
// not have a name. To work-around this, when we switch away from an
// unnamed window (presumably the main window) to some other named
// window, then we first set the main window name to a conventional
// value that we can later use this name to switch back.
$this->getSession()->evaluateScript(
'if (window.name == "") window.name = "' . self::MAIN_WINDOW_NAME . '"');
$this->getSession()->switchToWindow($windowname);
}
@ -166,7 +181,7 @@ class behat_general extends behat_base {
* @Given /^I switch to the main window$/
*/
public function switch_to_the_main_window() {
$this->getSession()->switchToWindow();
$this->getSession()->switchToWindow(self::MAIN_WINDOW_NAME);
}
/**

1
question/tests/behat/edit_questions.feature
View File

@ -40,5 +40,4 @@ Feature: A teacher can edit questions in the question bank
And I switch to "questionpreview" window
And I should see "Edited question name"
And I should see "Write a lot about what you want"
And I press "Close preview"
And I switch to the main window

1
question/tests/behat/preview_question.feature
View File

@ -42,5 +42,4 @@ Feature: A teacher can preview questions in the question bank
And I press "Start again"
And I press "Fill in correct responses"
And the field "Answer:" matches value "2"
And I press "Close preview"
And I switch to the main window