From af6b41c2e248b5847ecc2d40a2e9b803f61c2c7d Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Sat, 11 May 2019 11:48:18 +0200 Subject: [PATCH 1/4] Default to a 4K x 4K browser window. --- CHANGES.rst | 3 ++- src/plone/app/robotframework/selenium.robot | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index ad8f165f..dd04340a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,7 +14,8 @@ New features: Bug fixes: -- *add item here* +- Stabilize tests by defaulting to a browser window size of 4K x 4K. + [Rotonen] 1.3.1 (2018-10-31) diff --git a/src/plone/app/robotframework/selenium.robot b/src/plone/app/robotframework/selenium.robot index a121d354..d8fd2fe9 100644 --- a/src/plone/app/robotframework/selenium.robot +++ b/src/plone/app/robotframework/selenium.robot @@ -43,6 +43,7 @@ Wait until location is Plone Test Setup Open SauceLabs test browser + Run keyword and ignore error Set window size 4096 4096 Refresh JS/CSS resources Plone Test Teardown From b637a513d85aeb14c584ee301df7c0fdb0ea8cd1 Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Wed, 15 May 2019 11:37:26 +0200 Subject: [PATCH 2/4] Removed the legacy keyword Refresh JS/CSS resources. # Conflicts: # news/110.bugfix --- src/plone/app/robotframework/selenium.robot | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plone/app/robotframework/selenium.robot b/src/plone/app/robotframework/selenium.robot index d8fd2fe9..4decfb62 100644 --- a/src/plone/app/robotframework/selenium.robot +++ b/src/plone/app/robotframework/selenium.robot @@ -44,7 +44,6 @@ Wait until location is Plone Test Setup Open SauceLabs test browser Run keyword and ignore error Set window size 4096 4096 - Refresh JS/CSS resources Plone Test Teardown Run Keyword If Test Failed ${SELENIUM_RUN_ON_FAILURE} From 27bc1094ddb791b4b3c7544e5b8bd340ec1d1a9b Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Wed, 15 May 2019 11:38:08 +0200 Subject: [PATCH 3/4] Use the 'Plone test setup' and 'Plone test teardown' keywords. # Conflicts: # news/110.bugfix --- docs/source/happy.rst | 13 +++++++------ .../app/robotframework/tests/docs/test_hello.robot | 5 +++-- .../robotframework/tests/docs/test_keywords.robot | 5 +++-- .../tests/test_autologin_library.robot | 6 +++--- .../robotframework/tests/test_content_library.robot | 6 +++--- .../robotframework/tests/test_i18n_library.robot | 6 +++--- .../robotframework/tests/test_robotfixture.robot | 6 +++--- .../robotframework/tests/test_speakjs_library.robot | 6 +++--- .../robotframework/tests/test_users_library.robot | 10 +++++----- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/docs/source/happy.rst b/docs/source/happy.rst index 8e799df3..5fd8002b 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 *** @@ -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/src/plone/app/robotframework/tests/docs/test_hello.robot b/src/plone/app/robotframework/tests/docs/test_hello.robot index cef8aa09..48d6a13c 100644 --- 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 index b67bc701..d8cffaf7 100644 --- 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 index dd4852a2..2cb8ff0e 100644 --- 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 index bd783d71..df8eab07 100644 --- 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 index e72f15c9..f31612bf 100644 --- 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 index f163ae9b..1475f825 100644 --- 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 index d710fb8d..6e08c718 100644 --- 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 index f1328d26..2e8a982c 100644 --- 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 From 1af87fb045580cc9c663c8d542719407ff939a36 Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Feb 2019 17:22:44 +0100 Subject: [PATCH 4/4] Fix the travis build Fixes #100 --- .travis.yml | 6 +++--- CHANGES.rst | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75578331..8eaa806f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ +dist: xenial language: python python: 2.7 sudo: false addons: - sauce_connect: - username: $SAUCE_USERNAME - access_key: $SAUCE_ACCESS_KEY + sauce_connect: true cache: pip: true directories: @@ -19,6 +18,7 @@ env: - ARTIFACTS_S3_BUCKET=plone.app.robotframework - ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com:80/wd/hub + - ZSERVER_PORT=55001 matrix: - ROBOT_BROWSER=firefox ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER - ROBOT_BROWSER=chrome ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_NUMBER diff --git a/CHANGES.rst b/CHANGES.rst index dd04340a..2e105436 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -17,6 +17,9 @@ Bug fixes: - Stabilize tests by defaulting to a browser window size of 4K x 4K. [Rotonen] +- Fix the travis build which is broken since we are picking a random port + (fixes #100) + [ale-rt] 1.3.1 (2018-10-31) ------------------