From 7f871a604923e477bdb9406448daedd81e05949b Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Wed, 29 Jun 2016 16:53:23 +0200 Subject: [PATCH] Use ``Plone Test Setup`` and ``Plone Test Teardown`` from ``plone.app.robotframework`` master. And do an extra click in test_querystring.robot to give some dropdowns a chance to collapse, so they do not cover other parts that we wish to click. --- CHANGES.rst | 2 ++ Products/CMFPlone/tests/robot/test_actionmenu.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_actions.robot | 6 +++--- .../CMFPlone/tests/robot/test_controlpanel_editing.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_filter.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_language.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_markup.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_navigation.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_search.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_security.robot | 4 ++-- Products/CMFPlone/tests/robot/test_controlpanel_site.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_social.robot | 4 ++-- Products/CMFPlone/tests/robot/test_controlpanel_types.robot | 4 ++-- .../CMFPlone/tests/robot/test_controlpanel_usergroups.robot | 4 ++-- Products/CMFPlone/tests/robot/test_edit.robot | 4 ++-- Products/CMFPlone/tests/robot/test_edit_user_schema.robot | 4 ++-- Products/CMFPlone/tests/robot/test_folder_contents.robot | 4 ++-- Products/CMFPlone/tests/robot/test_linkintegrity.robot | 4 ++-- Products/CMFPlone/tests/robot/test_livesearch.robot | 4 ++-- Products/CMFPlone/tests/robot/test_overlays.robot | 4 ++-- Products/CMFPlone/tests/robot/test_portlets.robot | 4 ++-- Products/CMFPlone/tests/robot/test_querystring.robot | 5 +++-- Products/CMFPlone/tests/robot/test_thememapper.robot | 4 ++-- Products/CMFPlone/tests/robot/test_tinymce.robot | 4 ++-- setup.py | 2 +- 25 files changed, 51 insertions(+), 48 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2c32bd269b..4b99d043b3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -65,6 +65,8 @@ New features: Bug fixes: +- Use ``Plone Test Setup`` and ``Plone Test Teardown`` from ``plone.app.robotframework`` master. [maurits] + - Don't fail, when combining bundles and the target resource files (``BUNLDE-compiled.[min.js|css]``) do not yet exist on the filesystem. Fixes GenericSetup failing silently on import with when a to-be-compiled bundle which exists only as registry entry is processed in the ``combine-bundle`` step. [thet] diff --git a/Products/CMFPlone/tests/robot/test_actionmenu.robot b/Products/CMFPlone/tests/robot/test_actionmenu.robot index cc7ff5f07e..fb4c6e1d17 100644 --- a/Products/CMFPlone/tests/robot/test_actionmenu.robot +++ b/Products/CMFPlone/tests/robot/test_actionmenu.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Variables **************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot index c9e7a23d13..d6a8157e97 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot @@ -8,8 +8,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Open SauceLabs test browser -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Open SauceLabs test browser +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** @@ -122,4 +122,4 @@ anonymous users cannot see the action anymore anonymous users can see the action again Disable autologin Go to ${PLONE_URL} - Page Should Contain Site Map \ No newline at end of file + Page Should Contain Site Map diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_editing.robot b/Products/CMFPlone/tests/robot/test_controlpanel_editing.robot index e8828da28c..46a66d3b36 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_editing.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_editing.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_filter.robot b/Products/CMFPlone/tests/robot/test_controlpanel_filter.robot index 1cddc3380e..53695d65b4 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_filter.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_filter.robot @@ -17,8 +17,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_language.robot b/Products/CMFPlone/tests/robot/test_controlpanel_language.robot index f4c2b56ed0..7f3cc79790 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_language.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_language.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_markup.robot b/Products/CMFPlone/tests/robot/test_controlpanel_markup.robot index d81161d1f7..53c1e8c4ca 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_markup.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_markup.robot @@ -11,8 +11,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_navigation.robot b/Products/CMFPlone/tests/robot/test_controlpanel_navigation.robot index ebcd2c9b5a..ca715c9a09 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_navigation.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_navigation.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_search.robot b/Products/CMFPlone/tests/robot/test_controlpanel_search.robot index f3bab01a86..39d5cc07bb 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_search.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_search.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_security.robot b/Products/CMFPlone/tests/robot/test_controlpanel_security.robot index 82b1861e67..4e99025890 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_security.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_security.robot @@ -8,8 +8,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_site.robot b/Products/CMFPlone/tests/robot/test_controlpanel_site.robot index 921f6a04ca..94a4c24eb1 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_site.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_site.robot @@ -12,8 +12,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_social.robot b/Products/CMFPlone/tests/robot/test_controlpanel_social.robot index eae2c4c67f..058b75687e 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_social.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_social.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_types.robot b/Products/CMFPlone/tests/robot/test_controlpanel_types.robot index a0be91fb35..44f6e0e72e 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_types.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_types.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_usergroups.robot b/Products/CMFPlone/tests/robot/test_controlpanel_usergroups.robot index 3f9992c8f0..9572b23d00 100644 --- a/Products/CMFPlone/tests/robot/test_controlpanel_usergroups.robot +++ b/Products/CMFPlone/tests/robot/test_controlpanel_usergroups.robot @@ -17,8 +17,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_edit.robot b/Products/CMFPlone/tests/robot/test_edit.robot index e7000697c5..9ef9d9d75b 100644 --- a/Products/CMFPlone/tests/robot/test_edit.robot +++ b/Products/CMFPlone/tests/robot/test_edit.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Variables **************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_edit_user_schema.robot b/Products/CMFPlone/tests/robot/test_edit_user_schema.robot index 68d536f0eb..7cde187017 100644 --- a/Products/CMFPlone/tests/robot/test_edit_user_schema.robot +++ b/Products/CMFPlone/tests/robot/test_edit_user_schema.robot @@ -17,8 +17,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_folder_contents.robot b/Products/CMFPlone/tests/robot/test_folder_contents.robot index 9e5811eb37..1e6a11553b 100644 --- a/Products/CMFPlone/tests/robot/test_folder_contents.robot +++ b/Products/CMFPlone/tests/robot/test_folder_contents.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_linkintegrity.robot b/Products/CMFPlone/tests/robot/test_linkintegrity.robot index 0f39fbee79..dd9bcabd8b 100644 --- a/Products/CMFPlone/tests/robot/test_linkintegrity.robot +++ b/Products/CMFPlone/tests/robot/test_linkintegrity.robot @@ -17,8 +17,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_livesearch.robot b/Products/CMFPlone/tests/robot/test_livesearch.robot index 994a6dd225..c0f9d56067 100644 --- a/Products/CMFPlone/tests/robot/test_livesearch.robot +++ b/Products/CMFPlone/tests/robot/test_livesearch.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_overlays.robot b/Products/CMFPlone/tests/robot/test_overlays.robot index 50696c336b..ba7cbb94ab 100644 --- a/Products/CMFPlone/tests/robot/test_overlays.robot +++ b/Products/CMFPlone/tests/robot/test_overlays.robot @@ -13,8 +13,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource common.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources Background -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup Background +Test Teardown Run keywords Plone Test Teardown *** Test cases *** diff --git a/Products/CMFPlone/tests/robot/test_portlets.robot b/Products/CMFPlone/tests/robot/test_portlets.robot index f6fa67b039..ca54a825b0 100644 --- a/Products/CMFPlone/tests/robot/test_portlets.robot +++ b/Products/CMFPlone/tests/robot/test_portlets.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test cases *************************************************************** diff --git a/Products/CMFPlone/tests/robot/test_querystring.robot b/Products/CMFPlone/tests/robot/test_querystring.robot index a770ac7f1c..4f1b48837a 100644 --- a/Products/CMFPlone/tests/robot/test_querystring.robot +++ b/Products/CMFPlone/tests/robot/test_querystring.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Test Cases ************************************************************** @@ -77,6 +77,7 @@ I expect to be in Simple mode Click Element css=body open the select box titled ${NAME} + Click Element css=body Click Element css=.querystring-criteria-${NAME} .select2-container a select index type ${INDEX} diff --git a/Products/CMFPlone/tests/robot/test_thememapper.robot b/Products/CMFPlone/tests/robot/test_thememapper.robot index 8be1299f29..fdc0a942c9 100644 --- a/Products/CMFPlone/tests/robot/test_thememapper.robot +++ b/Products/CMFPlone/tests/robot/test_thememapper.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Variables *** diff --git a/Products/CMFPlone/tests/robot/test_tinymce.robot b/Products/CMFPlone/tests/robot/test_tinymce.robot index 5093f2182b..bfd9ddfca1 100644 --- a/Products/CMFPlone/tests/robot/test_tinymce.robot +++ b/Products/CMFPlone/tests/robot/test_tinymce.robot @@ -7,8 +7,8 @@ Library Remote ${PLONE_URL}/RobotRemote Resource keywords.robot -Test Setup Run keywords Open SauceLabs test browser Refresh JS/CSS resources -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone Test Setup +Test Teardown Run keywords Plone Test Teardown *** Variables **************************************************************** diff --git a/setup.py b/setup.py index 5c1d093b82..add4352b1c 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ test=[ 'lxml', 'mock', - 'plone.app.robotframework', + 'plone.app.robotframework>0.9.16', 'plone.app.testing', 'zope.globalrequest', 'zope.testing',