-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.transformchain
Branch: refs/heads/master Date: 2024-06-03T20:01:29Z Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> Commit: plone/plone.transformchain@d396cda [pre-commit.ci] pre-commit autoupdate updates: - [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](codespell-project/codespell@v2.2.6...v2.3.0) Files changed: M .pre-commit-config.yaml Repository: plone.transformchain Branch: refs/heads/master Date: 2024-06-04T03:21:37-04:00 Author: Jens W. Klein (jensens) <[email protected]> Commit: plone/plone.transformchain@b726beb Merge pull request #26 from plone/pre-commit-ci-update-config [pre-commit.ci] pre-commit autoupdate Files changed: M .pre-commit-config.yaml
- Loading branch information
Showing
1 changed file
with
17 additions
and
16 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,35 @@ | ||
Repository: Products.CMFDiffTool | ||
Repository: plone.transformchain | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2024-05-31T02:14:43+02:00 | ||
Author: Jens W. Klein (jensens) <[email protected]> | ||
Commit: https://github.com/plone/Products.CMFDiffTool/commit/72170fac977624abd57aad0aaeb3b7c071dfcd02 | ||
Date: 2024-06-03T20:01:29Z | ||
Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> | ||
Commit: https://github.com/plone/plone.transformchain/commit/d396cda5971771c02b515a167b56e1023996dfc7 | ||
|
||
[pre-commit.ci] pre-commit autoupdate | ||
|
||
Prepare for pa.discussion core addon | ||
updates: | ||
- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](https://github.com/codespell-project/codespell/compare/v2.2.6...v2.3.0) | ||
|
||
Files changed: | ||
A news/57.bugfix | ||
M Products/CMFDiffTool/tests/testChangeSet.py | ||
M .pre-commit-config.yaml | ||
|
||
b'diff --git a/Products/CMFDiffTool/tests/testChangeSet.py b/Products/CMFDiffTool/tests/testChangeSet.py\nindex 542514b..347d70b 100644\n--- a/Products/CMFDiffTool/tests/testChangeSet.py\n+++ b/Products/CMFDiffTool/tests/testChangeSet.py\n@@ -6,6 +6,7 @@\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FUNCTIONAL_TESTING\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n+from plone.base.utils import get_installer\n from plone.base.utils import safe_hasattr\n from Products.CMFCore.utils import getToolByName\n from Products.CMFDiffTool.ChangeSet import BaseChangeSet\n@@ -26,6 +27,10 @@ def setUp(self):\n # ChangeSet needs an acquisition wrapper\n self.cs = cs.__of__(self.portal)\n setRoles(self.portal, TEST_USER_ID, ["Contributor"])\n+ self.expected_diff_len = 13\n+ installer = get_installer(self.portal)\n+ if installer.is_product_installed("plone.app.discussion"):\n+ self.expected_diff_len += 1\n \n def testInterface(self):\n """Ensure that tool instances implement the portal_diff interface"""\n@@ -70,7 +75,7 @@ def testChangeSetFolderUnchanged(self):\n self.setupTestFolders()\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n sub_cs = self.cs.getSubDiffs()\n self.assertEqual(len(sub_cs), 3)\n@@ -87,7 +92,7 @@ def testChangeSetFolderChanged(self):\n self.folder.copy_of_folder1.setTitle("My New Title")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertFalse(diffs[0].same)\n self.assertEqual(\n diffs[0].ndiff(), "- My Folder Title%s+ My New Title" % linesep\n@@ -108,7 +113,7 @@ def testChangeSetFolderDocChanged(self):\n self.folder.copy_of_folder1.doc1.setTitle("My New Title")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n self.assertFalse(self.cs._added)\n@@ -133,7 +138,7 @@ def testChangeSetFolderDocRemoved(self):\n self.folder.copy_of_folder1.manage_delObjects("doc1")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n sub_cs = self.cs.getSubDiffs()\n@@ -155,7 +160,7 @@ def testChangeSetFolderDocAdded(self):\n )\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n sub_cs = self.cs.getSubDiffs()\n@@ -180,7 +185,7 @@ def testChangeSetFolderReordered(self):\n return\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertFalse(self.cs._added)\n self.assertFalse(self.cs._removed)\n@@ -217,7 +222,7 @@ def testChangeSetFolderComplex(self):\n \n self.cs.computeDiff(self.folder["folder1"], self.folder["copy_of_folder1"])\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertFalse(diffs[0].same)\n self.assertEqual(\n diffs[0].ndiff(), "- My Folder Title%s+ My New Title" % linesep\ndiff --git a/news/57.bugfix b/news/57.bugfix\nnew file mode 100644\nindex 0000000..f0a216a\n--- /dev/null\n+++ b/news/57.bugfix\n@@ -0,0 +1 @@\n+Fix tests to run with plone.app.discussion as core add-on. [@jensens]\n' | ||
b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d60054b..da56023 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -44,7 +44,7 @@ repos:\n # """\n ##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n' | ||
|
||
Repository: Products.CMFDiffTool | ||
Repository: plone.transformchain | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2024-05-31T09:17:46+02:00 | ||
Date: 2024-06-04T03:21:37-04:00 | ||
Author: Jens W. Klein (jensens) <[email protected]> | ||
Commit: https://github.com/plone/Products.CMFDiffTool/commit/ee216d11c3e407fe26d70a7794e4b047b84d7bef | ||
Commit: https://github.com/plone/plone.transformchain/commit/b726beb07bcd29b43f31a5f9e70c29567352c5a9 | ||
|
||
Merge pull request #57 from plone/pa-discussion-core-addon-2 | ||
Merge pull request #26 from plone/pre-commit-ci-update-config | ||
|
||
Prepare for pa.discussion core addon | ||
[pre-commit.ci] pre-commit autoupdate | ||
|
||
Files changed: | ||
A news/57.bugfix | ||
M Products/CMFDiffTool/tests/testChangeSet.py | ||
M .pre-commit-config.yaml | ||
|
||
b'diff --git a/Products/CMFDiffTool/tests/testChangeSet.py b/Products/CMFDiffTool/tests/testChangeSet.py\nindex 542514b..347d70b 100644\n--- a/Products/CMFDiffTool/tests/testChangeSet.py\n+++ b/Products/CMFDiffTool/tests/testChangeSet.py\n@@ -6,6 +6,7 @@\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FUNCTIONAL_TESTING\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n+from plone.base.utils import get_installer\n from plone.base.utils import safe_hasattr\n from Products.CMFCore.utils import getToolByName\n from Products.CMFDiffTool.ChangeSet import BaseChangeSet\n@@ -26,6 +27,10 @@ def setUp(self):\n # ChangeSet needs an acquisition wrapper\n self.cs = cs.__of__(self.portal)\n setRoles(self.portal, TEST_USER_ID, ["Contributor"])\n+ self.expected_diff_len = 13\n+ installer = get_installer(self.portal)\n+ if installer.is_product_installed("plone.app.discussion"):\n+ self.expected_diff_len += 1\n \n def testInterface(self):\n """Ensure that tool instances implement the portal_diff interface"""\n@@ -70,7 +75,7 @@ def testChangeSetFolderUnchanged(self):\n self.setupTestFolders()\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n sub_cs = self.cs.getSubDiffs()\n self.assertEqual(len(sub_cs), 3)\n@@ -87,7 +92,7 @@ def testChangeSetFolderChanged(self):\n self.folder.copy_of_folder1.setTitle("My New Title")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertFalse(diffs[0].same)\n self.assertEqual(\n diffs[0].ndiff(), "- My Folder Title%s+ My New Title" % linesep\n@@ -108,7 +113,7 @@ def testChangeSetFolderDocChanged(self):\n self.folder.copy_of_folder1.doc1.setTitle("My New Title")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n self.assertFalse(self.cs._added)\n@@ -133,7 +138,7 @@ def testChangeSetFolderDocRemoved(self):\n self.folder.copy_of_folder1.manage_delObjects("doc1")\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n sub_cs = self.cs.getSubDiffs()\n@@ -155,7 +160,7 @@ def testChangeSetFolderDocAdded(self):\n )\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertTrue(diffs[1].same)\n sub_cs = self.cs.getSubDiffs()\n@@ -180,7 +185,7 @@ def testChangeSetFolderReordered(self):\n return\n self.cs.computeDiff(self.folder.folder1, self.folder.copy_of_folder1)\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertTrue(diffs[0].same)\n self.assertFalse(self.cs._added)\n self.assertFalse(self.cs._removed)\n@@ -217,7 +222,7 @@ def testChangeSetFolderComplex(self):\n \n self.cs.computeDiff(self.folder["folder1"], self.folder["copy_of_folder1"])\n diffs = self.cs.getDiffs()\n- self.assertEqual(len(diffs), 14)\n+ self.assertEqual(len(diffs), self.expected_diff_len)\n self.assertFalse(diffs[0].same)\n self.assertEqual(\n diffs[0].ndiff(), "- My Folder Title%s+ My New Title" % linesep\ndiff --git a/news/57.bugfix b/news/57.bugfix\nnew file mode 100644\nindex 0000000..f0a216a\n--- /dev/null\n+++ b/news/57.bugfix\n@@ -0,0 +1 @@\n+Fix tests to run with plone.app.discussion as core add-on. [@jensens]\n' | ||
b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d60054b..da56023 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -44,7 +44,7 @@ repos:\n # """\n ##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n' | ||
|