Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle

question/tests/behat/behat_question.php

@@ -60,7 +60,7 @@ class behat_question extends behat_base {
             new Given('I follow "' . get_string('questionbank', 'question') . '"'),
             new Given('I press "' . get_string('createnewquestion', 'question') . '"'),
             new Given('I click on "' . $this->escape($questiontypexpath) . '" "xpath_element"'),
-            new Given('I click on "Next" "button" in the "#qtypechoicecontainer" "css_element"'),
+            new Given('I click on "#chooseqtype_submit" "css_element"'),
             new Given('I fill the moodle form with:', $questiondata),
             new Given('I press "' . get_string('savechanges') . '"')
         );

question/tests/behat/edit_questions.feature

@@ -4,7 +4,7 @@ Feature: A teacher can edit questions in the question bank
   As a teacher
   I need to edit questions
 
-  @javascript
+  @javascript @_switch_window
   Scenario: Edit a previously created question
     Given the following "users" exists:
       | username | firstname | lastname | email |

question/tests/behat/preview_question.feature

@@ -1,4 +1,4 @@
-@core @core_question
+@core @core_question @_switch_window
 Feature: A teacher can preview questions in the question bank
   In order to ensure the questions are properly created
   As a teacher