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

moodle · Mar 7, 2017 · 7ebe17f · 7ebe17f
2 parents 58798ec + acdda4f
commit 7ebe17f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/tests/behat/behat_forms.php b/lib/tests/behat/behat_forms.php
@@ -241,8 +241,9 @@ public function i_set_the_field_to_multiline($field, PyStringNode $value) {
      * @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);
     }
 

diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
@@ -624,8 +624,16 @@ public function assert_page_not_contains_text($text) {
             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 @@ function($context, $args) {
             false,
             true
         );
-
     }
 
     /**