From 9a335e021d572ab282fb4339a978622f707d02a1 Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Tue, 14 May 2019 10:52:46 +0200 Subject: [PATCH] Use the shared test setup and test teardown keywords in Robot tests. --- news/349.bugfix | 3 +++ .../multilingual/tests/robot/test_add_translation.robot | 7 ++++--- .../app/multilingual/tests/robot/test_schemaeditor.robot | 7 ++++--- .../multilingual/tests/robot/test_translate_content.robot | 7 ++++--- 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 news/349.bugfix diff --git a/news/349.bugfix b/news/349.bugfix new file mode 100644 index 000000000..2278b62db --- /dev/null +++ b/news/349.bugfix @@ -0,0 +1,3 @@ +- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot + tests. + [Rotonen] diff --git a/src/plone/app/multilingual/tests/robot/test_add_translation.robot b/src/plone/app/multilingual/tests/robot/test_add_translation.robot index 2dd46e6fb..6f943373f 100644 --- a/src/plone/app/multilingual/tests/robot/test_add_translation.robot +++ b/src/plone/app/multilingual/tests/robot/test_add_translation.robot @@ -1,13 +1,14 @@ *** Settings *** -Resource plone/app/robotframework/selenium.robot Resource plone/app/robotframework/keywords.robot +Resource plone/app/robotframework/saucelabs.robot +Resource plone/app/robotframework/selenium.robot Resource Products/CMFPlone/tests/robot/keywords.robot Library Remote ${PLONE_URL}/RobotRemote -Test Setup Setup 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/multilingual/tests/robot/test_schemaeditor.robot b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot index 9b35c5abd..0ce75781c 100644 --- a/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot +++ b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot @@ -1,12 +1,13 @@ *** Settings *** -Resource plone/app/robotframework/selenium.robot Resource plone/app/robotframework/keywords.robot +Resource plone/app/robotframework/saucelabs.robot +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 *** Test Cases *** diff --git a/src/plone/app/multilingual/tests/robot/test_translate_content.robot b/src/plone/app/multilingual/tests/robot/test_translate_content.robot index 49b03778b..5cc97789f 100644 --- a/src/plone/app/multilingual/tests/robot/test_translate_content.robot +++ b/src/plone/app/multilingual/tests/robot/test_translate_content.robot @@ -1,12 +1,13 @@ *** Settings *** -Resource plone/app/robotframework/selenium.robot Resource plone/app/robotframework/keywords.robot +Resource plone/app/robotframework/saucelabs.robot +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 *** Test Cases ***