Unify robot tests, cleanup

buildout.cfg

@@ -1,7 +1,9 @@
 [buildout]
 extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg
           https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
-extensions += buildout.dumprequirements
+extensions +=
+    buildout.dumprequirements
+    buildout.dumppickedversions
 dump-requirements-file = ${buildout:directory}/docs/rtd-requirements.txt
 package-name = collective.easyform
 package-extras = [test,recaptcha]
@@ -61,10 +63,9 @@ Pygments = 1.6
 [pybot]
 recipe = zc.recipe.egg
 eggs =
-    Pillow
     plone.app.robotframework
     ${instance:eggs}
 scripts = pybot=updatedocsimages
 initialization =
     import sys
-    sys.argv.extend(['-d', '${buildout:directory}/docs/images', '-r', 'NONE', '-l', 'NONE', '-o', 'NONE', '${buildout:directory}/docs/images.robot'])
+    sys.argv.extend(['-d', '${buildout:directory}/docs/images', '-r', 'NONE', '-l', 'NONE', '-o', 'NONE', '${buildout:directory}/collective/easyform/tests/robot/images.robot'])

collective/easyform/configure.zcml

@@ -5,7 +5,7 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="collective.easyform">
 
-  <includeDependencies package="." />
+  <include package="plone.app.dexterity" />
 
   <i18n:registerTranslations directory="locales" />
 

collective/easyform/tests/base.py

@@ -10,8 +10,10 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import login
 from plone.app.testing import setRoles
+from plone.testing import Layer
 from plone.testing.z2 import Browser
 from plone.testing.z2 import ZSERVER_FIXTURE
+from plone.app.robotframework.testing import AUTOLOGIN_LIBRARY_FIXTURE
 
 from transaction import commit
 from unittest2 import TestCase
@@ -36,9 +38,9 @@ def setUpZope(self, app, configurationContext):
         self.loadZCML(
             package=collective.easyform, context=configurationContext)
         try:
-            import collective.recaptcha
+            import plone.formwidget.recaptcha
             self.loadZCML(
-                package=collective.recaptcha, context=configurationContext)
+                package=plone.formwidget.recaptcha, context=configurationContext)
         except ImportError:
             pass
 
@@ -65,8 +67,9 @@ def setUpPloneSite(self, portal):
     name='collective.easyform:Functional',
 )
 ACCEPTANCE_TESTING = FunctionalTesting(
-    bases=(FIXTURE, ZSERVER_FIXTURE),
+    bases=(FIXTURE, AUTOLOGIN_LIBRARY_FIXTURE, ZSERVER_FIXTURE),
     name='collective.easyform:Acceptance')
+ROBOT_TESTING = Layer(name='collective.easyform:Robot')
 
 
 class EasyFormTestCase(TestCase):

docs/images.robot → collective/easyform/tests/robot/images.robot

@@ -10,9 +10,7 @@ Suite Teardown  Teardown
 *** Keywords ***
 
 Setup
-    Setup Plone site
-    ...     plone.app.robotframework.testing.AUTOLOGIN_ROBOT_TESTING
-    ...     collective.easyform.tests.base.ACCEPTANCE_TESTING
+    Setup Plone site  collective.easyform.tests.base.ACCEPTANCE_TESTING
     Import library  Remote  ${PLONE_URL}/RobotRemote
 
 Teardown

collective/easyform/tests/robot/robot_easyform.robot

@@ -0,0 +1,74 @@
+*** Settings ***
+
+Resource  plone/app/robotframework/server.robot
+Resource  plone/app/robotframework/keywords.robot
+
+Suite Setup  Setup
+Suite Teardown  Teardown
+
+*** Test Cases ***
+
+Simple EasyForm
+    a site owner
+    a easyform  EasyForm
+    Click Link  Fields
+    Click Link  Actions
+    Click Link  View
+    Input text  name=form.widgets.replyto  test@example.com
+    Input text  name=form.widgets.topic  test subject
+    Input text  name=form.widgets.comments  test comments
+    Click Button  Submit
+    Page should contain  test@example.com
+    Page should contain  test subject
+    Page should contain  test comments
+
+Add a choice field with vocabulary values
+    a site owner
+    a easyform  EasyForm
+    Click Link  Fields
+    Add field  Hobbies  hobbies  Multiple Choice
+    Open field settings  hobbies
+    Input text  form-widgets-values  Chess\nSoccer\nBaseball\nVideo games
+    Click Button  Save
+    Wait until page contains element  form-widgets-hobbies-3
+    Click Link  View
+    Wait until page contains element  form-widgets-hobbies-3
+
+
+*** Keywords ***
+
+Setup
+    Setup Plone site  collective.easyform.tests.base.ACCEPTANCE_TESTING
+    Import library  Remote  ${PLONE_URL}/RobotRemote
+
+Teardown
+    Teardown Plone Site
+
+a easyform
+    [Arguments]  ${title}
+    Go to  ${PLONE_URL}/++add++EasyForm
+    Input text  name=form.widgets.IDublinCore.title  ${title}
+    Click Button  Save
+
+a site owner
+    Enable autologin as  Manager
+    Set autologin username  Admin
+
+Add field
+    [Arguments]    ${field_title}    ${field_id}    ${field_type}
+    [Documentation]    Add field in current easyform
+
+    Click Overlay Button  Add new field…
+    Input text for sure  form-widgets-title  ${field_title}
+    Focus  form-widgets-__name__
+    Wait until keyword succeeds  10  1  Textfield Value Should Be  form-widgets-__name__  ${field_id}
+    Select from list  form-widgets-factory  ${field_type}
+    Click button  Add
+    Wait overlay is closed
+
+Open field settings
+    [Arguments]    ${field_id}
+    Click Overlay Link  xpath=//div[@data-field_id='${field_id}']//a[@class='fieldSettings link-overlay']
+
+Wait overlay is closed
+    Wait until keyword succeeds  60  1  Page should not contain element  css=div.overlay