Refactor

collective · Jan 13, 2016 · 30b766e · 30b766e
1 parent 7469bc7
commit 30b766e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,9 +6,8 @@ There's a frood who really knows where his towel is.
 1.0a13 (unreleased)
 ^^^^^^^^^^^^^^^^^^^
 
-- If mockup is present and new widgets are used, call the scan function from
-  the mockup-registry to initialize them.
-  [frapell, rodfersou]
+- RichText tile is now compatible with plone.app.widgets (closes `#543`_).
+  [frapell, rodfersou, hvelarde]
 
 - Implement drag and drop among tiles (closes `#487`_).
   [rodfersou]
@@ -723,5 +722,6 @@ There's a frood who really knows where his towel is.
 .. _`#526`: https://github.com/collective/collective.cover/issues/526
 .. _`#530`: https://github.com/collective/collective.cover/issues/530
 .. _`#534`: https://github.com/collective/collective.cover/issues/534
+.. _`#543`: https://github.com/collective/collective.cover/issues/543
 .. _`#559`: https://github.com/collective/collective.cover/issues/559
 .. _`PloneFormGen`: https://pypi.python.org/pypi/Products.PloneFormGen
diff --git a/buildout.cfg b/buildout.cfg
@@ -7,9 +7,6 @@ extends =
 
 package-name = collective.cover
 package-extras = [test]
-test-eggs =
-    Pillow
-    plone.app.widgets
 
 parts +=
     checkversions

diff --git a/src/collective/cover/tests/test_richtext_tile.robot b/src/collective/cover/tests/test_richtext_tile.robot
@@ -33,9 +33,12 @@ Test RichText Tile
     Wait For Condition  return typeof tinyMCE != "undefined" && tinyMCE.activeEditor != null
     Click Button  Cancel
     Wait Until Page Does Not Contain  Edit Rich Text Tile
-    # check if tinymce load on second time
+
+    # check if TinyMCE loads a second time
+    # see: https://github.com/collective/collective.cover/issues/543
     Click Link  css=${edit_link_selector}
     Wait For Condition  return typeof tinyMCE != "undefined" && tinyMCE.activeEditor != null
+
     Execute Javascript  tinyMCE.activeEditor.setContent("${text_sample}");
     Click Button  Save
     # save via ajax => wait until the tile has been reloaded

diff --git a/versions-4.2.x.cfg b/versions-4.2.x.cfg
@@ -1,3 +1,6 @@
+[buildout]
+test-eggs = Pillow
+
 [versions]
 collective.js.bootstrap = 2.3.1.1
 collective.js.jqueryui = 1.8.16.9

diff --git a/versions-4.3.x.cfg b/versions-4.3.x.cfg
@@ -1,3 +1,6 @@
+[buildout]
+test-eggs = plone.app.widgets
+
 [versions]
 collective.js.bootstrap = 2.3.1.1
 plone.app.blocks = 2.2.0