-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/main Date: 2024-12-11T16:06:59-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.restapi@d012d3f fix time-dependence of event recurrent tests (#1850) * fix time-dependence of event recurrent tests * changelog Files changed: A news/1850.internal M src/plone/restapi/tests/test_serializer_summary.py
- Loading branch information
Showing
1 changed file
with
10 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,20 @@ | ||
Repository: plone.volto | ||
Repository: plone.restapi | ||
|
||
|
||
Branch: refs/heads/main | ||
Date: 2024-12-11T10:52:44-08:00 | ||
Date: 2024-12-11T16:06:59-08:00 | ||
Author: David Glick (davisagli) <[email protected]> | ||
Commit: https://github.com/plone/plone.volto/commit/7f76dd0fe0b82a34f7383f1e57a612450c8f6689 | ||
Commit: https://github.com/plone/plone.restapi/commit/d012d3f784c5897d5b70164daabdb99b3903ebca | ||
|
||
Enable versioning for pages by default | ||
fix time-dependence of event recurrent tests (#1850) | ||
|
||
Files changed: | ||
A news/143.bugfix | ||
M src/plone/volto/profiles/default/types/Document.xml | ||
|
||
b'diff --git a/news/143.bugfix b/news/143.bugfix\nnew file mode 100644\nindex 0000000..1dd27a7\n--- /dev/null\n+++ b/news/143.bugfix\n@@ -0,0 +1 @@\n+Enable the `plone.versioning` behavior for the Page content type. @davisagli\ndiff --git a/src/plone/volto/profiles/default/types/Document.xml b/src/plone/volto/profiles/default/types/Document.xml\nindex 6f739de..9fe7c0e 100644\n--- a/src/plone/volto/profiles/default/types/Document.xml\n+++ b/src/plone/volto/profiles/default/types/Document.xml\n@@ -18,6 +18,7 @@\n <element value="plone.dublincore" />\n <element value="plone.relateditems" />\n <element value="plone.locking" />\n+ <element value="plone.versioning" />\n <element value="volto.blocks" />\n <element value="volto.preview_image" />\n </property>\n' | ||
|
||
Repository: plone.volto | ||
|
||
|
||
Branch: refs/heads/main | ||
Date: 2024-12-11T15:18:32-08:00 | ||
Author: David Glick (davisagli) <[email protected]> | ||
Commit: https://github.com/plone/plone.volto/commit/61b1bab1c39a36fe1a369a3cb1a59852a204ae47 | ||
|
||
Merge pull request #169 from plone/page-versioning | ||
|
||
Enable versioning for pages by default | ||
* fix time-dependence of event recurrent tests | ||
|
||
* changelog | ||
|
||
Files changed: | ||
A news/143.bugfix | ||
M src/plone/volto/profiles/default/types/Document.xml | ||
A news/1850.internal | ||
M src/plone/restapi/tests/test_serializer_summary.py | ||
|
||
b'diff --git a/news/143.bugfix b/news/143.bugfix\nnew file mode 100644\nindex 0000000..1dd27a7\n--- /dev/null\n+++ b/news/143.bugfix\n@@ -0,0 +1 @@\n+Enable the `plone.versioning` behavior for the Page content type. @davisagli\ndiff --git a/src/plone/volto/profiles/default/types/Document.xml b/src/plone/volto/profiles/default/types/Document.xml\nindex 6f739de..9fe7c0e 100644\n--- a/src/plone/volto/profiles/default/types/Document.xml\n+++ b/src/plone/volto/profiles/default/types/Document.xml\n@@ -18,6 +18,7 @@\n <element value="plone.dublincore" />\n <element value="plone.relateditems" />\n <element value="plone.locking" />\n+ <element value="plone.versioning" />\n <element value="volto.blocks" />\n <element value="volto.preview_image" />\n </property>\n' | ||
b'diff --git a/news/1850.internal b/news/1850.internal\nnew file mode 100644\nindex 000000000..d4a67450a\n--- /dev/null\n+++ b/news/1850.internal\n@@ -0,0 +1 @@\n+Fix time-dependence of tests. @davisagli\ndiff --git a/src/plone/restapi/tests/test_serializer_summary.py b/src/plone/restapi/tests/test_serializer_summary.py\nindex 9a7b7db45..e186c2f31 100644\n--- a/src/plone/restapi/tests/test_serializer_summary.py\n+++ b/src/plone/restapi/tests/test_serializer_summary.py\n@@ -17,6 +17,7 @@\n from zope.interface import alsoProvides\n \n import Missing\n+import pytz\n import unittest\n \n \n@@ -234,14 +235,15 @@ def setUp(self):\n )\n self.portal.portal_types.DXTestDocument.behaviors = behaviors\n \n+ self.start = datetime(1995, 7, 31, 13, 45, tzinfo=pytz.timezone("UTC"))\n self.event = createContentInContainer(\n self.portal,\n "DXTestDocument",\n id="doc1",\n title="Lorem Ipsum event",\n description="Description event",\n- start=datetime.now(),\n- end=datetime.now() + timedelta(hours=1),\n+ start=self.start,\n+ end=self.start + timedelta(hours=1),\n recurrence="RRULE:FREQ=DAILY;COUNT=3", # see https://github.com/plone/plone.app.event/blob/master/plone/app/event/tests/base_setup.py\n )\n \n@@ -256,7 +258,7 @@ def tearDown(self):\n "this test needs a plone.app.event version that does not include a IContentListingObject adapter",\n )\n def test_dx_event_with_recurrence_old_version(self):\n- tomorrow = datetime.now() + timedelta(days=1)\n+ tomorrow = self.start + timedelta(days=1)\n tomorrow_str = tomorrow.strftime("%Y-%m-%d")\n ot = OccurrenceTraverser(self.event, self.request)\n ocurrence = ot.publishTraverse(self.request, tomorrow_str)\n@@ -269,7 +271,7 @@ def test_dx_event_with_recurrence_old_version(self):\n "this test needs a plone.app.event version that includes a IContentListingObject adapter",\n )\n def test_dx_event_with_recurrence_new_version(self):\n- tomorrow = datetime.now() + timedelta(days=1)\n+ tomorrow = self.start + timedelta(days=1)\n tomorrow_str = tomorrow.strftime("%Y-%m-%d")\n ot = OccurrenceTraverser(self.event, self.request)\n ocurrence = ot.publishTraverse(self.request, tomorrow_str)\n' | ||
|