Commit 33fd2a04 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes I04cdd63a,Ibc5652e2

* changes:
  Bug 1694875: Getting annotation behat test to actually test right thing
  Bug 1715260: Keep tinymce fields on block config form error
parents 9a40f91c 4e1ba125
...@@ -134,6 +134,13 @@ ...@@ -134,6 +134,13 @@
onModalCancel(e, configbutton); onModalCancel(e, configbutton);
}); });
} }
// Restart any TinyMCE fields if needed
if (typeof tinyMCE !== 'undefined') {
jQuery(form).find('textarea.wysiwyg').each(function() {
tinyMCE.execCommand('mceAddEditor', false, $(this).prop('id'));
});
}
} }
//Private Methods //Private Methods
......
...@@ -20,7 +20,7 @@ Scenario: Accessing annotation block (Bug 1443730) ...@@ -20,7 +20,7 @@ Scenario: Accessing annotation block (Bug 1443730)
And I choose "Plugin administration" in "Extensions" from administration menu And I choose "Plugin administration" in "Extensions" from administration menu
And I press "activate_blocktype_annotation_submit" And I press "activate_blocktype_annotation_submit"
And I am on homepage And I am on homepage
# Editing page to enable annotation block # Editing page to add annotation block
And follow "My page is amazing" And follow "My page is amazing"
And I follow "Edit" And I follow "Edit"
And I expand "General" node And I expand "General" node
...@@ -28,16 +28,11 @@ Scenario: Accessing annotation block (Bug 1443730) ...@@ -28,16 +28,11 @@ Scenario: Accessing annotation block (Bug 1443730)
And I press "Add" And I press "Add"
And I press "Save" And I press "Save"
# Checking empty annotation message # Checking empty annotation message
And I am on homepage
And follow "My page is amazing"
And I follow "Edit"
And I expand "General" node
And I follow "Annotation"
And I press "Add"
And I press "Save"
And I should see "This field is required" And I should see "This field is required"
And I fill in "Please grade me" in editor "Annotation"
And I press "Save"
# Checking that the block saved by using the one thing on the page that changed. # Checking that the block saved by using the one thing on the page that changed.
And I am on homepage And I am on homepage
And follow "My page is amazing" And follow "My page is amazing"
And I should see "Annotation" And I should see "Annotation"
And I should see "My page is amazing" And I should see "Please grade me"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment