Skip to content

Commit

Permalink
[fc] Repository: plone.app.multilingual
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2019-05-14T10:52:46+02:00
Author: Joni Orponen (Rotonen) <joni.orponen@gmail.com>
Commit: plone/plone.app.multilingual@9a335e0

Use the shared test setup and test teardown keywords in Robot tests.

Files changed:
A news/349.bugfix
M src/plone/app/multilingual/tests/robot/test_add_translation.robot
M src/plone/app/multilingual/tests/robot/test_schemaeditor.robot
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2019-10-30T11:13:06+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.multilingual@95be612

Merge pull request #350 from plone/roto-window-resize-huge

Default to a 4K x 4K browser window in Robot tests

Files changed:
A news/349.bugfix
M src/plone/app/multilingual/tests/robot/test_add_translation.robot
M src/plone/app/multilingual/tests/robot/test_schemaeditor.robot
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
  • Loading branch information
@jensens
jensens committed Oct 30, 2019
1 parent 95f536b commit 7d0cbd9
Showing 1 changed file with 17 additions and 28 deletions.
45 changes: 17 additions & 28 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,38 @@
Repository: plone.app.discussion
Repository: plone.app.multilingual


Branch: refs/heads/master
Date: 2019-05-14T10:37:15+02:00
Date: 2019-05-14T10:52:46+02:00
Author: Joni Orponen (Rotonen) <joni.orponen@gmail.com>
Commit: https://github.com/plone/plone.app.discussion/commit/45fd2c51ce601a5ae259ab0a6c9e347c9421976f
Commit: https://github.com/plone/plone.app.multilingual/commit/9a335e021d572ab282fb4339a978622f707d02a1

Use the shared test setup and test teardown keywords in Robot tests.

Files changed:
A news/155.bugfix
M plone/app/discussion/tests/robot/test_discussion.robot
A news/349.bugfix
M src/plone/app/multilingual/tests/robot/test_add_translation.robot
M src/plone/app/multilingual/tests/robot/test_schemaeditor.robot
M src/plone/app/multilingual/tests/robot/test_translate_content.robot

b"diff --git a/news/155.bugfix b/news/155.bugfix\nnew file mode 100644\nindex 00000000..2278b62d\n--- /dev/null\n+++ b/news/155.bugfix\n@@ -0,0 +1,3 @@\n+- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot\n+ tests.\n+ [Rotonen]\ndiff --git a/plone/app/discussion/tests/robot/test_discussion.robot b/plone/app/discussion/tests/robot/test_discussion.robot\nindex a4e56e18..32e1e881 100644\n--- a/plone/app/discussion/tests/robot/test_discussion.robot\n+++ b/plone/app/discussion/tests/robot/test_discussion.robot\n@@ -9,12 +9,13 @@\n \n *** Settings ***\n \n+Resource plone/app/robotframework/saucelabs.robot\n Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\n"
b"diff --git a/news/349.bugfix b/news/349.bugfix\nnew file mode 100644\nindex 00000000..2278b62d\n--- /dev/null\n+++ b/news/349.bugfix\n@@ -0,0 +1,3 @@\n+- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot\n+ tests.\n+ [Rotonen]\ndiff --git a/src/plone/app/multilingual/tests/robot/test_add_translation.robot b/src/plone/app/multilingual/tests/robot/test_add_translation.robot\nindex 2dd46e6f..6f943373 100644\n--- a/src/plone/app/multilingual/tests/robot/test_add_translation.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_add_translation.robot\n@@ -1,13 +1,14 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n Resource Products/CMFPlone/tests/robot/keywords.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Setup test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n *** Test Cases ***\n \ndiff --git a/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\nindex 9b35c5ab..0ce75781 100644\n--- a/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\n@@ -1,12 +1,13 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\ndiff --git a/src/plone/app/multilingual/tests/robot/test_translate_content.robot b/src/plone/app/multilingual/tests/robot/test_translate_content.robot\nindex 49b03778..5cc97789 100644\n--- a/src/plone/app/multilingual/tests/robot/test_translate_content.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_translate_content.robot\n@@ -1,12 +1,13 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\n"

Repository: plone.app.discussion
Repository: plone.app.multilingual


Branch: refs/heads/master
Date: 2019-05-14T10:40:09+02:00
Author: Joni Orponen (Rotonen) <joni.orponen@gmail.com>
Commit: https://github.com/plone/plone.app.discussion/commit/c1518d87d1f492b79bece80d7a1c13cf5c7383b1

Re-enable two disabled Robot tests.

Files changed:
M plone/app/discussion/tests/robot/test_discussion.robot

b'diff --git a/plone/app/discussion/tests/robot/test_discussion.robot b/plone/app/discussion/tests/robot/test_discussion.robot\nindex 32e1e881..dc1caa25 100644\n--- a/plone/app/discussion/tests/robot/test_discussion.robot\n+++ b/plone/app/discussion/tests/robot/test_discussion.robot\n@@ -32,13 +32,13 @@ Add Comment to a Document\n When I add a comment\n Then I can see the comment below the document\n \n-#Reply to a comment on a Document\n-# Given a logged-in Site Administrator\n-# and a document with discussion enabled\n+Reply to a comment on a Document\n+ Given a logged-in Site Administrator\n+ and a document with discussion enabled\n \n-#Delete Comment from a Document\n-# Given a logged-in Site Administrator\n-# and a document with discussion enabled\n+Delete Comment from a Document\n+ Given a logged-in Site Administrator\n+ and a document with discussion enabled\n \n \n *** Keywords ***\n'

Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2019-10-30T11:12:07+01:00
Date: 2019-10-30T11:13:06+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.discussion/commit/06c55bec140c28099835f63b6c1b36d6d33c26a7
Commit: https://github.com/plone/plone.app.multilingual/commit/95be612ed088626f51da349a6af486e61eb884e3

Merge pull request #156 from plone/roto-window-resize-huge
Merge pull request #350 from plone/roto-window-resize-huge

Default to a 4K x 4K browser window in Robot tests

Files changed:
A news/155.bugfix
M plone/app/discussion/tests/robot/test_discussion.robot
A news/349.bugfix
M src/plone/app/multilingual/tests/robot/test_add_translation.robot
M src/plone/app/multilingual/tests/robot/test_schemaeditor.robot
M src/plone/app/multilingual/tests/robot/test_translate_content.robot

b"diff --git a/news/155.bugfix b/news/155.bugfix\nnew file mode 100644\nindex 00000000..2278b62d\n--- /dev/null\n+++ b/news/155.bugfix\n@@ -0,0 +1,3 @@\n+- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot\n+ tests.\n+ [Rotonen]\ndiff --git a/plone/app/discussion/tests/robot/test_discussion.robot b/plone/app/discussion/tests/robot/test_discussion.robot\nindex a4e56e18..dc1caa25 100644\n--- a/plone/app/discussion/tests/robot/test_discussion.robot\n+++ b/plone/app/discussion/tests/robot/test_discussion.robot\n@@ -9,12 +9,13 @@\n \n *** Settings ***\n \n+Resource plone/app/robotframework/saucelabs.robot\n Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\n@@ -31,13 +32,13 @@ Add Comment to a Document\n When I add a comment\n Then I can see the comment below the document\n \n-#Reply to a comment on a Document\n-# Given a logged-in Site Administrator\n-# and a document with discussion enabled\n+Reply to a comment on a Document\n+ Given a logged-in Site Administrator\n+ and a document with discussion enabled\n \n-#Delete Comment from a Document\n-# Given a logged-in Site Administrator\n-# and a document with discussion enabled\n+Delete Comment from a Document\n+ Given a logged-in Site Administrator\n+ and a document with discussion enabled\n \n \n *** Keywords ***\n"
b"diff --git a/news/349.bugfix b/news/349.bugfix\nnew file mode 100644\nindex 00000000..2278b62d\n--- /dev/null\n+++ b/news/349.bugfix\n@@ -0,0 +1,3 @@\n+- Use the shared 'Plone test setup' and 'Plone test teardown' keywords in Robot\n+ tests.\n+ [Rotonen]\ndiff --git a/src/plone/app/multilingual/tests/robot/test_add_translation.robot b/src/plone/app/multilingual/tests/robot/test_add_translation.robot\nindex 2dd46e6f..6f943373 100644\n--- a/src/plone/app/multilingual/tests/robot/test_add_translation.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_add_translation.robot\n@@ -1,13 +1,14 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n Resource Products/CMFPlone/tests/robot/keywords.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Setup test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n *** Test Cases ***\n \ndiff --git a/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\nindex 9b35c5ab..0ce75781 100644\n--- a/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_schemaeditor.robot\n@@ -1,12 +1,13 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\ndiff --git a/src/plone/app/multilingual/tests/robot/test_translate_content.robot b/src/plone/app/multilingual/tests/robot/test_translate_content.robot\nindex 49b03778..5cc97789 100644\n--- a/src/plone/app/multilingual/tests/robot/test_translate_content.robot\n+++ b/src/plone/app/multilingual/tests/robot/test_translate_content.robot\n@@ -1,12 +1,13 @@\n *** Settings ***\n \n-Resource plone/app/robotframework/selenium.robot\n Resource plone/app/robotframework/keywords.robot\n+Resource plone/app/robotframework/saucelabs.robot\n+Resource plone/app/robotframework/selenium.robot\n \n Library Remote ${PLONE_URL}/RobotRemote\n \n-Test Setup Open test browser\n-Test Teardown Close all browsers\n+Test Setup Run Keywords Plone test setup\n+Test Teardown Run keywords Plone test teardown\n \n \n *** Test Cases ***\n"

0 comments on commit 7d0cbd9

Please sign in to comment.