Skip to content

Commit

Permalink
[fc] Repository: plone.app.robotframework
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2023-06-28T12:46:15+03:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.robotframework@8fbf30a

fix: drop empty keywords

Although it has been empty _always_ [1], until now there was no error
being displayed about it.

[1]
plone/plone.app.robotframework@59dbbdb

Files changed:
M src/plone/app/robotframework/keywords.robot
Repository: plone.app.robotframework

Branch: refs/heads/master
Date: 2023-06-28T12:48:07+03:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.robotframework@f69a791

Add news entry

Files changed:
A news/147.bugfix
Repository: plone.app.robotframework

Branch: refs/heads/master
Date: 2023-06-28T17:43:27+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.robotframework@56a1288

Merge pull request #148 from plone/drop-empty-keyword

Drop empty keyword

Files changed:
A news/147.bugfix
M src/plone/app/robotframework/keywords.robot
  • Loading branch information
mauritsvanrees committed Jun 28, 2023
1 parent 77aa325 commit a5bc1e4
Showing 1 changed file with 45 additions and 9 deletions.
54 changes: 45 additions & 9 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,54 @@
Repository: Products.CMFPlone
Repository: plone.app.robotframework


Branch: refs/heads/6.0.x
Date: 2023-06-27T16:34:12-07:00
Branch: refs/heads/master
Date: 2023-06-28T12:46:15+03:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/plone.app.robotframework/commit/8fbf30ade5458cee82549bd09da2fae0dd8ad533

fix: drop empty keywords

Although it has been empty _always_ [1], until now there was no error
being displayed about it.

[1]
https://github.com/plone/plone.app.robotframework/commit/59dbbdb45e8513a4b30f16c044efe9c36a078e4c

Files changed:
M src/plone/app/robotframework/keywords.robot

b'diff --git a/src/plone/app/robotframework/keywords.robot b/src/plone/app/robotframework/keywords.robot\nindex 1c9a5c2..12267b9 100644\n--- a/src/plone/app/robotframework/keywords.robot\n+++ b/src/plone/app/robotframework/keywords.robot\n@@ -81,16 +81,6 @@ Log in as site owner\n ... with all the rights and privileges of that user.\n Log in ${SITE_OWNER_NAME} ${SITE_OWNER_PASSWORD}\n \n-Log in as test user with role\n- [Arguments] ${usrid} ${role}\n-\n- # We need a generic way to login with a user that has one or more roles.\n-\n- # Do we need to be able to assign multiple roles at once?\n-\n- # Do we need to assign roles to arbitray users or is it sufficient if we\n- # always assign those roles to the test user?\n-\n Log out\n Go to ${PLONE_URL}/logout\n Page Should Contain Element css=#login-form\n'

Repository: plone.app.robotframework


Branch: refs/heads/master
Date: 2023-06-28T12:48:07+03:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/plone.app.robotframework/commit/f69a791e54add496e7e6374ab2ebe6c634c03d57

Add news entry

Files changed:
A news/147.bugfix

b'diff --git a/news/147.bugfix b/news/147.bugfix\nnew file mode 100644\nindex 0000000..e067d82\n--- /dev/null\n+++ b/news/147.bugfix\n@@ -0,0 +1,2 @@\n+Remove unused and empty keyword that was displaying an error.\n+[gforcada]\n'

Repository: plone.app.robotframework


Branch: refs/heads/master
Date: 2023-06-28T17:43:27+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/b32812fa32b1c369afac26c9acd2a61d0bdde514
Commit: https://github.com/plone/plone.app.robotframework/commit/56a1288950301231544eacb26cc406f3b4b2f30a

Fix unstable robot test scenario Reorder Folder Contents. (#3812)
Merge pull request #148 from plone/drop-empty-keyword

Fixes https://github.com/plone/Products.CMFPlone/issues/3811 by waiting until elements are visible.
Drop empty keyword

Files changed:
A news/3811.tests
M Products/CMFPlone/tests/robot/test_folder_contents.robot
A news/147.bugfix
M src/plone/app/robotframework/keywords.robot

b'diff --git a/Products/CMFPlone/tests/robot/test_folder_contents.robot b/Products/CMFPlone/tests/robot/test_folder_contents.robot\nindex 98cee696e9..198ec80f06 100644\n--- a/Products/CMFPlone/tests/robot/test_folder_contents.robot\n+++ b/Products/CMFPlone/tests/robot/test_folder_contents.robot\n@@ -96,6 +96,10 @@ I reorder the elements\n \n The Order Should Be\n [Arguments] ${first} ${second} ${third} ${fourth}\n+ Wait Until Element Is Visible css=#doc${first}\n+ Wait Until Element Is Visible css=#doc${second}\n+ Wait Until Element Is Visible css=#doc${third}\n+ Wait Until Element Is Visible css=#doc${fourth}\n Should be above css=tr[data-id="doc${first}"] css=tr[data-id="doc${second}"]\n Should be above css=tr[data-id="doc${second}"] css=tr[data-id="doc${third}"]\n Should be above css=tr[data-id="doc${third}"] css=tr[data-id="doc${fourth}"]\ndiff --git a/news/3811.tests b/news/3811.tests\nnew file mode 100644\nindex 0000000000..4904e5f467\n--- /dev/null\n+++ b/news/3811.tests\n@@ -0,0 +1,2 @@\n+Fix unstable robot test scenario Reorder Folder Contents.\n+[maurits]\n'
b'diff --git a/news/147.bugfix b/news/147.bugfix\nnew file mode 100644\nindex 0000000..e067d82\n--- /dev/null\n+++ b/news/147.bugfix\n@@ -0,0 +1,2 @@\n+Remove unused and empty keyword that was displaying an error.\n+[gforcada]\ndiff --git a/src/plone/app/robotframework/keywords.robot b/src/plone/app/robotframework/keywords.robot\nindex 1c9a5c2..12267b9 100644\n--- a/src/plone/app/robotframework/keywords.robot\n+++ b/src/plone/app/robotframework/keywords.robot\n@@ -81,16 +81,6 @@ Log in as site owner\n ... with all the rights and privileges of that user.\n Log in ${SITE_OWNER_NAME} ${SITE_OWNER_PASSWORD}\n \n-Log in as test user with role\n- [Arguments] ${usrid} ${role}\n-\n- # We need a generic way to login with a user that has one or more roles.\n-\n- # Do we need to be able to assign multiple roles at once?\n-\n- # Do we need to assign roles to arbitray users or is it sufficient if we\n- # always assign those roles to the test user?\n-\n Log out\n Go to ${PLONE_URL}/logout\n Page Should Contain Element css=#login-form\n'

0 comments on commit a5bc1e4

Please sign in to comment.