MDL-44084 behat: Fixed setting value for form editor

rajeshtaneja · Mar 27, 2014 · 3e46999 · 3e46999
1 parent 3c87c08
commit 3e46999
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/behat/form_field/behat_form_editor.php b/lib/behat/form_field/behat_form_editor.php
@@ -54,12 +54,12 @@ public function set_value($value) {
             $js = '
 var editor = Y.one(document.getElementById("'.$editorid.'editable"));
 if (editor) {
-    editor.setHTML("' . $value . '").focus();
-} else {
-    editor = Y.one(document.getElementById("'.$editorid.'"));
-    editor.set("value", "' . $value . '");
-}';
-            $result = $this->session->executeScript($js);
+    editor.setHTML("' . $value . '");
+}
+editor = Y.one(document.getElementById("'.$editorid.'"));
+editor.set("value", "' . $value . '");
+';
+            $this->session->executeScript($js);
         } else {
             parent::set_value($value);
         }

diff --git a/mod/wiki/tests/behat/preview_page.feature b/mod/wiki/tests/behat/preview_page.feature
@@ -41,7 +41,7 @@ Feature: Edited wiki pages may be previewed before saving
 
   @javascript
   Scenario: Page contents preview before saving with Javascript enabled
-    Then the field "HTML format" matches value "<p>Student page contents to be previewed</p>"
+    Then the field "HTML format" matches value "Student page contents to be previewed"
     And I press "Cancel"
 
   Scenario: Page contents preview before saving with Javascript disabled

diff --git a/mod/wiki/tests/behat/wiki_formats.feature b/mod/wiki/tests/behat/wiki_formats.feature
@@ -67,8 +67,8 @@ Feature: There is a choice of formats for editing a wiki page
     When I set the following fields to these values:
       | HTML format | 1 |
     And I press "Create page"
-    Then "#id_newcontent_editor_tbl" "css_element" should exist
-    And ".mce_bold" "css_element" should exist
+    Then "#id_newcontent_editoreditable" "css_element" should exist
+    And ".editor_atto_content" "css_element" should exist
     And I set the following fields to these values:
       | HTML format | I'm a text |
     And I press "Save"