Use the 'Plone test setup' and 'Plone test teardown' keywords.

plone · May 11, 2019 · 090d6fe · 090d6fe
1 parent ba66a43
commit 090d6fe
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 30 deletions.
diff --git 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 ***
 
@@ -167,12 +167,13 @@ Here is a more complicated example with some user keywords in action:
 
     Force Tags  wip-not_in_docs
 
+    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  Plone test setup
+    Test Teardown  Plone test teardown
 
     *** Variables ***
 
@@ -378,8 +379,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
@@ -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
@@ -2,10 +2,11 @@
 
 Force Tags  wip-not_in_docs
 
+Resource  plone/app/robotframework/saucelabs.robot
 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
@@ -2,12 +2,13 @@
 
 Force Tags  wip-not_in_docs
 
+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
 
 *** Variables ***
 

diff --git a/src/plone/app/robotframework/tests/test_autologin_library.robot b/src/plone/app/robotframework/tests/test_autologin_library.robot
@@ -1,13 +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  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
@@ -1,12 +1,12 @@
 *** Settings ***
 
-Resource  plone/app/robotframework/selenium.robot
 Resource  plone/app/robotframework/saucelabs.robot
+Resource  plone/app/robotframework/selenium.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
@@ -1,13 +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 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
@@ -1,13 +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 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
@@ -1,15 +1,15 @@
 *** 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  plone/app/robotframework/annotate.robot
 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
@@ -1,13 +1,13 @@
 *** Settings ***
 
+Resource  plone/app/robotframework/keywords.robot
 Resource  plone/app/robotframework/selenium.robot
 Resource  plone/app/robotframework/saucelabs.robot
-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