L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-mdl-58056-m32' of https://github.com/rajeshtaneja/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2017-03-07 11:08:23 -03:00
parent 5e3ce67f37 3e340aba45
commit 17c82085fc
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/behat/behat_forms.php
+3 -2
View File
@@ -241,8 +241,9 @@ class behat_forms extends behat_base {
* @return void
*/
public function i_set_the_field_with_xpath_to($fieldxpath, $value) {
$fieldNode = $this->find('xpath', $fieldxpath);
$field = behat_field_manager::get_form_field($fieldNode, $this->getSession());
$fieldnode = $this->find('xpath', $fieldxpath);
$this->ensure_node_is_visible($fieldnode);
$field = behat_field_manager::get_form_field($fieldnode, $this->getSession());
$field->set_value($value);
}
lib/tests/behat/behat_general.php
+10 -3
View File
@@ -624,8 +624,16 @@ class behat_general extends behat_base {
function($context, $args) {
foreach ($args['nodes'] as $node) {
if ($node->isVisible()) {
throw new ExpectationException('"' . $args['text'] . '" text was found in the page', $context->getSession());
// If element is removed from dom, then just exit.
try {
// If element is visible then throw exception, so we keep spinning.
if ($node->isVisible()) {
throw new ExpectationException('"' . $args['text'] . '" text was found in the page',
$context->getSession());
}
} catch (WebDriver\Exception\NoSuchElement $e) {
// Do nothing just return, as element is no more on page.
return true;
}
}
@@ -637,7 +645,6 @@ class behat_general extends behat_base {
false,
true
);
}
/**