Skip to content

Commit

Permalink
[fc] Repository: plone.app.event
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2024-11-07T11:01:21+01:00
Author: 1letter (1letter) <[email protected]>
Commit: plone/plone.app.event@91708eb

fix import of TextLinesFieldWidget

Files changed:
M plone/app/event/dx/behaviors.py
Repository: plone.app.event

Branch: refs/heads/master
Date: 2024-11-07T11:01:26+01:00
Author: 1letter (1letter) <[email protected]>
Commit: plone/plone.app.event@db91975

add news

Files changed:
A news/414.bugfix
Repository: plone.app.event

Branch: refs/heads/master
Date: 2024-11-07T12:21:17+01:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: plone/plone.app.event@aedf39d

Merge pull request #415 from plone/fix#414

fix import of widget

Files changed:
A news/414.bugfix
M plone/app/event/dx/behaviors.py
  • Loading branch information
petschki committed Nov 7, 2024
1 parent 434db5e commit 38d360e
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
Repository: Products.CMFPlone
Repository: plone.app.event


Branch: refs/heads/master
Date: 2024-11-06T11:26:18+01:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: https://github.com/plone/Products.CMFPlone/commit/46d58913c5f65fb73463e29564da824a7499b896
Date: 2024-11-07T11:01:21+01:00
Author: 1letter (1letter) <[email protected]>
Commit: https://github.com/plone/plone.app.event/commit/91708eb98bff5607f22030c893b213865158a1a8

wait for conditions
fix import of TextLinesFieldWidget

Files changed:
M Products/CMFPlone/tests/robot/test_overlays.robot
M plone/app/event/dx/behaviors.py

b'diff --git a/Products/CMFPlone/tests/robot/test_overlays.robot b/Products/CMFPlone/tests/robot/test_overlays.robot\nindex 5b96532721..d35f27ea41 100644\n--- a/Products/CMFPlone/tests/robot/test_overlays.robot\n+++ b/Products/CMFPlone/tests/robot/test_overlays.robot\n@@ -276,27 +276,27 @@ I enter valid user data\n # THEN\n \n overlay should open\n- Get Element States //div[contains(@class,"modal-dialog")] contains visible\n+ Wait For Condition Element States //div[contains(@class,"modal-dialog")] contains visible\n \n \n overlay should close\n- Get Element Count //div[contains(@class,"modal-dialog")] should be 0\n+ Wait For Condition Element Count //div[contains(@class,"modal-dialog")] should be 0\n \n \n overlay should remain open\n- Get Element States //div[contains(@class,"modal-wrapper")] contains visible\n+ Wait For Condition Element States //div[contains(@class,"modal-wrapper")] contains visible\n \n \n login overlay shows an error\n- Get Text //div[contains(@class,"modal-wrapper")] contains Error\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains Error\n \n \n overlay shows an error\n- Get Text //div[contains(@class,"modal-wrapper")] contains There were errors\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains There were errors\n \n \n overlay requires to compile a field\n- Get Text //div[contains(@class,"modal-wrapper")] contains Required input is missing\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains Required input is missing\n \n \n # DRY\n'
b'diff --git a/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py\nindex d29addf2..f8595105 100644\n--- a/plone/app/event/dx/behaviors.py\n+++ b/plone/app/event/dx/behaviors.py\n@@ -51,7 +51,7 @@\n # Import fails for Plone < 6.1\n # version pin of plone.app.z3cform is set to plone.app.z3cform==4.3.2\n # TextLinesFieldWidget is introduced in plone.app.z3cform==4.4.0\n- from plone.app.z3cform.widgets.textlines import TextLinesFieldWidget\n+ from plone.app.z3cform.widgets.text import TextLinesFieldWidget\n except ImportError:\n from z3c.form.browser.textlines import TextLinesFieldWidget\n \n'

Repository: Products.CMFPlone
Repository: plone.app.event


Branch: refs/heads/master
Date: 2024-11-06T11:28:34+01:00
Author: Peter Mathis (petschki) <[email protected]>
Commit: https://github.com/plone/Products.CMFPlone/commit/4a932d538258965237b21f347792a23dc0b1a494
Date: 2024-11-07T11:01:26+01:00
Author: 1letter (1letter) <[email protected]>
Commit: https://github.com/plone/plone.app.event/commit/db919758a6f298122cfab14612276d2447579dab

changenote
add news

Files changed:
A news/4045.bugfixes
A news/414.bugfix

b'diff --git a/news/4045.bugfixes b/news/4045.bugfixes\nnew file mode 100644\nindex 0000000000..0744c9a37b\n--- /dev/null\n+++ b/news/4045.bugfixes\n@@ -0,0 +1,2 @@\n+Fix more unstable robottests with "Wait For Condition".\n+[petschki]\n'
b'diff --git a/news/414.bugfix b/news/414.bugfix\nnew file mode 100644\nindex 000000000..244d32255\n--- /dev/null\n+++ b/news/414.bugfix\n@@ -0,0 +1,2 @@\n+fix import of TextLinesFieldWidget, correctness the rendering of EventAttendees TextLinesFieldWidget\n+[1letter]\n'

Repository: Products.CMFPlone
Repository: plone.app.event


Branch: refs/heads/master
Date: 2024-11-06T15:51:10+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/89bf29c833dc74b673296f334fcff35cac3a0d39
Date: 2024-11-07T12:21:17+01:00
Author: Peter Mathis (petschki) <[email protected].com>
Commit: https://github.com/plone/plone.app.event/commit/aedf39df2ef91c60a9cc48bb6429e961f85b7fdc

Merge pull request #4045 from plone/petschki-robottest-modal-fix
Merge pull request #415 from plone/fix#414

Flaky robottest fixes: wait for conditions
fix import of widget

Files changed:
A news/4045.bugfixes
M Products/CMFPlone/tests/robot/test_overlays.robot
A news/414.bugfix
M plone/app/event/dx/behaviors.py

b'diff --git a/Products/CMFPlone/tests/robot/test_overlays.robot b/Products/CMFPlone/tests/robot/test_overlays.robot\nindex 5b96532721..d35f27ea41 100644\n--- a/Products/CMFPlone/tests/robot/test_overlays.robot\n+++ b/Products/CMFPlone/tests/robot/test_overlays.robot\n@@ -276,27 +276,27 @@ I enter valid user data\n # THEN\n \n overlay should open\n- Get Element States //div[contains(@class,"modal-dialog")] contains visible\n+ Wait For Condition Element States //div[contains(@class,"modal-dialog")] contains visible\n \n \n overlay should close\n- Get Element Count //div[contains(@class,"modal-dialog")] should be 0\n+ Wait For Condition Element Count //div[contains(@class,"modal-dialog")] should be 0\n \n \n overlay should remain open\n- Get Element States //div[contains(@class,"modal-wrapper")] contains visible\n+ Wait For Condition Element States //div[contains(@class,"modal-wrapper")] contains visible\n \n \n login overlay shows an error\n- Get Text //div[contains(@class,"modal-wrapper")] contains Error\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains Error\n \n \n overlay shows an error\n- Get Text //div[contains(@class,"modal-wrapper")] contains There were errors\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains There were errors\n \n \n overlay requires to compile a field\n- Get Text //div[contains(@class,"modal-wrapper")] contains Required input is missing\n+ Wait For Condition Text //div[contains(@class,"modal-wrapper")] contains Required input is missing\n \n \n # DRY\ndiff --git a/news/4045.bugfixes b/news/4045.bugfixes\nnew file mode 100644\nindex 0000000000..0744c9a37b\n--- /dev/null\n+++ b/news/4045.bugfixes\n@@ -0,0 +1,2 @@\n+Fix more unstable robottests with "Wait For Condition".\n+[petschki]\n'
b'diff --git a/news/414.bugfix b/news/414.bugfix\nnew file mode 100644\nindex 000000000..244d32255\n--- /dev/null\n+++ b/news/414.bugfix\n@@ -0,0 +1,2 @@\n+fix import of TextLinesFieldWidget, correctness the rendering of EventAttendees TextLinesFieldWidget\n+[1letter]\ndiff --git a/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py\nindex d29addf24..f85951050 100644\n--- a/plone/app/event/dx/behaviors.py\n+++ b/plone/app/event/dx/behaviors.py\n@@ -51,7 +51,7 @@\n # Import fails for Plone < 6.1\n # version pin of plone.app.z3cform is set to plone.app.z3cform==4.3.2\n # TextLinesFieldWidget is introduced in plone.app.z3cform==4.4.0\n- from plone.app.z3cform.widgets.textlines import TextLinesFieldWidget\n+ from plone.app.z3cform.widgets.text import TextLinesFieldWidget\n except ImportError:\n from z3c.form.browser.textlines import TextLinesFieldWidget\n \n'

0 comments on commit 38d360e

Please sign in to comment.