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 cc71f97 commit b98f335
Showing 1 changed file with 28 additions and 22 deletions.
50 changes: 28 additions & 22 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,54 @@
Repository: plone.app.layout
Repository: plone.app.robotframework


Branch: refs/heads/master
Date: 2023-06-27T16:29:25+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plone.app.layout/commit/2558772a46eeaa8c83ca0d0a749e6b58255a88f9
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 markup in `contentviews.pt` after zpretty
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 plone/app/layout/viewlets/contentviews.pt
M src/plone/app/robotframework/keywords.robot

b'diff --git a/plone/app/layout/viewlets/contentviews.pt b/plone/app/layout/viewlets/contentviews.pt\nindex c2c49ebc..3fa607ca 100644\n--- a/plone/app/layout/viewlets/contentviews.pt\n+++ b/plone/app/layout/viewlets/contentviews.pt\n@@ -11,18 +11,18 @@\n <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n </tal:block>\n \n- <li class="border-top my-2">\n+ <li class="border-top my-2"></li>\n \n- <tal:contentmenus>\n- <div tal:replace="structure provider:plone.contentmenu"></div>\n- </tal:contentmenus>\n+ <tal:contentmenus>\n+ <div tal:replace="structure provider:plone.contentmenu"></div>\n+ </tal:contentmenus>\n \n- <li class="border-top my-2">\n+ <li class="border-top my-2"></li>\n \n- <tal:block define="\n- actions view/tabSet2;\n- ">\n- <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n- </tal:block>\n+ <tal:block define="\n+ actions view/tabSet2;\n+ ">\n+ <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n+ </tal:block>\n \n- </li></li></tal:contentviews>\n+</tal:contentviews>\n'
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.layout
Repository: plone.app.robotframework


Branch: refs/heads/master
Date: 2023-06-27T16:30:48+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plone.app.layout/commit/a9bf88901a0dd122f90fbf4ea07f6c7180714a22
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

changenote
Add news entry

Files changed:
A news/350.bugfix
A news/147.bugfix

b'diff --git a/news/350.bugfix b/news/350.bugfix\nnew file mode 100644\nindex 00000000..0884f1c9\n--- /dev/null\n+++ b/news/350.bugfix\n@@ -0,0 +1,2 @@\n+Fix nested `li` tags after zpretty in `contentviews.pt`\n+[petschki]\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]\n'

Repository: plone.app.layout
Repository: plone.app.robotframework


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

Merge pull request #350 from plone/petschki-contentviews-fix
Merge pull request #148 from plone/drop-empty-keyword

Fix markup in `contentviews.pt` after zpretty
Drop empty keyword

Files changed:
A news/350.bugfix
M plone/app/layout/viewlets/contentviews.pt
A news/147.bugfix
M src/plone/app/robotframework/keywords.robot

b'diff --git a/news/350.bugfix b/news/350.bugfix\nnew file mode 100644\nindex 00000000..0884f1c9\n--- /dev/null\n+++ b/news/350.bugfix\n@@ -0,0 +1,2 @@\n+Fix nested `li` tags after zpretty in `contentviews.pt`\n+[petschki]\ndiff --git a/plone/app/layout/viewlets/contentviews.pt b/plone/app/layout/viewlets/contentviews.pt\nindex c2c49ebc..3fa607ca 100644\n--- a/plone/app/layout/viewlets/contentviews.pt\n+++ b/plone/app/layout/viewlets/contentviews.pt\n@@ -11,18 +11,18 @@\n <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n </tal:block>\n \n- <li class="border-top my-2">\n+ <li class="border-top my-2"></li>\n \n- <tal:contentmenus>\n- <div tal:replace="structure provider:plone.contentmenu"></div>\n- </tal:contentmenus>\n+ <tal:contentmenus>\n+ <div tal:replace="structure provider:plone.contentmenu"></div>\n+ </tal:contentmenus>\n \n- <li class="border-top my-2">\n+ <li class="border-top my-2"></li>\n \n- <tal:block define="\n- actions view/tabSet2;\n- ">\n- <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n- </tal:block>\n+ <tal:block define="\n+ actions view/tabSet2;\n+ ">\n+ <div tal:replace="structure python: view.menu_template(actions=actions)"></div>\n+ </tal:block>\n \n- </li></li></tal:contentviews>\n+</tal:contentviews>\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 b98f335

Please sign in to comment.