From 60f25feb773d2e9f7da35aa63504969f51d46424 Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Sat, 11 May 2019 14:03:49 +0200 Subject: [PATCH] Use the 'Plone test setup' and 'Plone test teardown' keywords. --- docs/source/happy.rst | 12 ++++++------ news/110.bugfix | 3 +++ .../app/robotframework/tests/docs/test_hello.robot | 4 ++-- .../robotframework/tests/docs/test_keywords.robot | 4 ++-- .../tests/test_autologin_library.robot | 4 ++-- .../robotframework/tests/test_content_library.robot | 4 ++-- .../app/robotframework/tests/test_i18n_library.robot | 4 ++-- .../app/robotframework/tests/test_robotfixture.robot | 4 ++-- .../robotframework/tests/test_speakjs_library.robot | 4 ++-- .../robotframework/tests/test_users_library.robot | 8 ++++---- 10 files changed, 27 insertions(+), 24 deletions(-) diff --git a/docs/source/happy.rst b/docs/source/happy.rst index 8e799df..6515f3d 100644 --- a/docs/source/happy.rst +++ b/docs/source/happy.rst @@ -138,8 +138,8 @@ For example, a ``test_hello.robot`` : Force Tags wip-not_in_docs Resource plone/app/robotframework/selenium.robot - Test Setup Open test browser - Test Teardown Close all browsers + Test Setup Plone test setup + Test Teardown Plone test teardown *** Test Cases *** @@ -171,8 +171,8 @@ Here is a more complicated example with some user keywords in action: Library Remote ${PLONE_URL}/RobotRemote - Test Setup Open test browser - Test Teardown Close all browsers + Test Setup Plone test setup + Test Teardown Plone test teardown *** Variables *** @@ -378,8 +378,8 @@ what to do next: Library Remote ${PLONE_URL}/RobotRemote - Test Setup Open test browser - Test Teardown Close all browsers + Test Setup Plone test setup + Test Teardown Plone test teardown *** Test Cases *** diff --git a/news/110.bugfix b/news/110.bugfix index 091c965..233d256 100644 --- a/news/110.bugfix +++ b/news/110.bugfix @@ -3,3 +3,6 @@ - Removed the legacy keyword ``Refresh JS/CSS resources``. [Rotonen] + +- Use the 'Plone test setup' and 'Plone test teardown' keywords in the Robot tests. + [Rotonen] diff --git a/src/plone/app/robotframework/tests/docs/test_hello.robot b/src/plone/app/robotframework/tests/docs/test_hello.robot index cef8aa0..60f25e2 100644 --- a/src/plone/app/robotframework/tests/docs/test_hello.robot +++ b/src/plone/app/robotframework/tests/docs/test_hello.robot @@ -4,8 +4,8 @@ Force Tags wip-not_in_docs Resource plone/app/robotframework/selenium.robot -Test Setup Open test browser -Test Teardown Close all browsers +Test Setup Run keywords Plone test setup +Test Teardown Run keywords Plone test teardown *** Test Cases *** diff --git a/src/plone/app/robotframework/tests/docs/test_keywords.robot b/src/plone/app/robotframework/tests/docs/test_keywords.robot index b67bc70..33a9f00 100644 --- a/src/plone/app/robotframework/tests/docs/test_keywords.robot +++ b/src/plone/app/robotframework/tests/docs/test_keywords.robot @@ -6,8 +6,8 @@ Resource plone/app/robotframework/selenium.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open test browser -Test Teardown Close all browsers +Test Setup Run keywords Plone test setup +Test Teardown Run keywords Plone test teardown *** Variables *** diff --git a/src/plone/app/robotframework/tests/test_autologin_library.robot b/src/plone/app/robotframework/tests/test_autologin_library.robot index dd4852a..04ff14c 100644 --- a/src/plone/app/robotframework/tests/test_autologin_library.robot +++ b/src/plone/app/robotframework/tests/test_autologin_library.robot @@ -6,8 +6,8 @@ Resource plone/app/robotframework/saucelabs.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Run keywords Open SauceLabs test browser -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/src/plone/app/robotframework/tests/test_content_library.robot b/src/plone/app/robotframework/tests/test_content_library.robot index bd783d7..293b463 100644 --- a/src/plone/app/robotframework/tests/test_content_library.robot +++ b/src/plone/app/robotframework/tests/test_content_library.robot @@ -5,8 +5,8 @@ Resource plone/app/robotframework/saucelabs.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open SauceLabs test browser -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/src/plone/app/robotframework/tests/test_i18n_library.robot b/src/plone/app/robotframework/tests/test_i18n_library.robot index e72f15c..da294b8 100644 --- a/src/plone/app/robotframework/tests/test_i18n_library.robot +++ b/src/plone/app/robotframework/tests/test_i18n_library.robot @@ -6,8 +6,8 @@ Resource plone/app/robotframework/saucelabs.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open SauceLabs test browser -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/src/plone/app/robotframework/tests/test_robotfixture.robot b/src/plone/app/robotframework/tests/test_robotfixture.robot index f163ae9..3c2ebef 100644 --- a/src/plone/app/robotframework/tests/test_robotfixture.robot +++ b/src/plone/app/robotframework/tests/test_robotfixture.robot @@ -6,8 +6,8 @@ Resource plone/app/robotframework/saucelabs.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open SauceLabs test browser -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/src/plone/app/robotframework/tests/test_speakjs_library.robot b/src/plone/app/robotframework/tests/test_speakjs_library.robot index d710fb8..a1a6d29 100644 --- a/src/plone/app/robotframework/tests/test_speakjs_library.robot +++ b/src/plone/app/robotframework/tests/test_speakjs_library.robot @@ -8,8 +8,8 @@ Resource plone/app/robotframework/speak.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open SauceLabs test browser -Test Teardown Run keywords Report test status Close all browsers +Test Setup Run keywords Plone test setup +Test Teardown Run keywords Plone test teardown *** Keywords *** diff --git a/src/plone/app/robotframework/tests/test_users_library.robot b/src/plone/app/robotframework/tests/test_users_library.robot index f1328d2..dfc8149 100644 --- a/src/plone/app/robotframework/tests/test_users_library.robot +++ b/src/plone/app/robotframework/tests/test_users_library.robot @@ -6,8 +6,8 @@ Resource plone/app/robotframework/keywords.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Open SauceLabs test browser -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 *** @@ -26,7 +26,7 @@ Test user creation with roles as args Disable autologin Log in siteadmin siteadmin Go to homepage - + Page should contain siteadmin Page should contain Manage portlets @@ -36,6 +36,6 @@ Test user creation with roles as kwarg Create user siteadmin roles=@{roles} Log in siteadmin siteadmin Go to homepage - + Page should contain siteadmin Page should contain Manage portlets