From 424bf12f17f3dccd664ecb1ec4571ce8288fc4a5 Mon Sep 17 00:00:00 2001 From: petschki Date: Mon, 11 Nov 2024 09:52:54 +0100 Subject: [PATCH] [fc] Repository: Products.CMFPlone Branch: refs/heads/master Date: 2024-11-09T20:48:14+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/Products.CMFPlone/commit/4837ae7ec4f446527738e3c3169eb9ef3029be95 add test scenario for contentbrowser Files changed: M Products/CMFPlone/tests/robot/test_contentbrowser.robot Repository: Products.CMFPlone Branch: refs/heads/master Date: 2024-11-09T20:48:14+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/Products.CMFPlone/commit/6fb73e8a7271160b9ea1f53b09d671625bf56b52 add news Files changed: A news/4043.tests Repository: Products.CMFPlone Branch: refs/heads/master Date: 2024-11-11T09:52:54+01:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/Products.CMFPlone/commit/ba15fc5323fe405274844359c04333a76cd92342 Merge pull request #4053 from plone/more-contentbrowser-tests add test scenario for contentbrowser Files changed: A news/4043.tests M Products/CMFPlone/tests/robot/test_contentbrowser.robot --- last_commit.txt | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 5eab4b05f0..1e83c8821d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,32 +1,48 @@ -Repository: plone.staticresources +Repository: Products.CMFPlone Branch: refs/heads/master -Date: 2024-11-11T08:25:57+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.staticresources/commit/822a217a83426ea4ad1a676e998d93732834602b +Date: 2024-11-09T20:48:14+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/Products.CMFPlone/commit/4837ae7ec4f446527738e3c3169eb9ef3029be95 -Preparing release 2.2.0b2 +add test scenario for contentbrowser Files changed: -M CHANGES.rst -M setup.py -D news/359.bugfix +M Products/CMFPlone/tests/robot/test_contentbrowser.robot -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 082564cfb..4718d43ca 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,17 @@ Changelog\n \n .. towncrier release notes start\n \n+2.2.0b2 (2024-11-11)\n+--------------------\n+\n+Bug fixes:\n+\n+\n+- Fix `pat-contentbrowser` for `CatalogSource` widgets.\n+ See https://github.com/plone/mockup/releases/tag/5.2.0-beta.1\n+ [petschki] (#359)\n+\n+\n 2.2.0b1 (2024-10-31)\n --------------------\n \ndiff --git a/news/359.bugfix b/news/359.bugfix\ndeleted file mode 100644\nindex 7b4c1c3bd..000000000\n--- a/news/359.bugfix\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-Fix `pat-contentbrowser` for `CatalogSource` widgets.\n-See https://github.com/plone/mockup/releases/tag/5.2.0-beta.1\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex 02e2f9022..e487cb138 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.2.0b2.dev0",\n+ version="2.2.0b2",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n' +b'diff --git a/Products/CMFPlone/tests/robot/test_contentbrowser.robot b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\nindex e370ffa17c..28190b084d 100644\n--- a/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n+++ b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n@@ -16,6 +16,8 @@ Test Teardown Run keywords Plone Test Teardown\n \n ${ASSET_FOLDER} asset-folder\n ${DOCUMENT_ID} doc\n+${LINK_ID} internal-anchor\n+\n \n *** Test cases ***************************************************************\n \n@@ -66,6 +68,12 @@ Scenario: search and select an image via contentbrowser\n and I save the document\n Then the document contain the image by search\n \n+Scenario: add contenttype Link with an internal target\n+ Given a logged-in site administrator\n+ and a Link\n+ When I edit the Link\n+ Then the internal target is added\n+\n \n *** Keywords *****************************************************************\n \n@@ -107,6 +115,9 @@ a nested asset folder\n a document\n Create content type=Document id=${DOCUMENT_ID} title=My Page\n \n+a Link\n+ Create content type=Link id=${LINK_ID} title=My Link\n+\n # --- WHEN ------------------------------------------------------------------\n \n I select a related item image via contentbrowser\n@@ -215,7 +226,13 @@ I search and select an image via contentbrowser\n I save the document\n Click //button[@id="form-buttons-save"]\n \n-\n+I edit the Link\n+ Go to ${PLONE_URL}/${LINK_ID}/edit\n+ Click //div[contains(@class, "content-browser-selected-items")]/a\n+ # Click first element in first column, that is a folder\n+ Click item in contenbrowser column 1 1\n+ # Click the select Button in the Toolbar of column 2\n+ Click //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]/button\n \n # --- THEN ------------------------------------------------------------------\n \n@@ -239,6 +256,8 @@ the document contain the image by search\n the document contain the uploaded image\n rendered textfield contain the image with title plone-logo.png\n \n+the internal target is added\n+ Get Text //div[contains(@class, "content-browser-selected-items")]//span[@class="item-title"] should be Test Folder\n \n #--- Helper DRY -------------------------------------------------------------\n \n' -Repository: plone.staticresources +Repository: Products.CMFPlone Branch: refs/heads/master -Date: 2024-11-11T08:30:51+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.staticresources/commit/b1a78be1476d238b629e1df64de767bd31abfeb4 +Date: 2024-11-09T20:48:14+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/Products.CMFPlone/commit/6fb73e8a7271160b9ea1f53b09d671625bf56b52 -Back to development: 2.2.0b3 +add news Files changed: -M setup.py +A news/4043.tests -b'diff --git a/setup.py b/setup.py\nindex e487cb138..b23377c26 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.2.0b2",\n+ version="2.2.0b3.dev0",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n' +b'diff --git a/news/4043.tests b/news/4043.tests\nnew file mode 100644\nindex 0000000000..3f1439ebd3\n--- /dev/null\n+++ b/news/4043.tests\n@@ -0,0 +1,2 @@\n+add robot test scenario for contentbrowser widget\n+[1letter]\n' + +Repository: Products.CMFPlone + + +Branch: refs/heads/master +Date: 2024-11-11T09:52:54+01:00 +Author: Peter Mathis (petschki) +Commit: https://github.com/plone/Products.CMFPlone/commit/ba15fc5323fe405274844359c04333a76cd92342 + +Merge pull request #4053 from plone/more-contentbrowser-tests + +add test scenario for contentbrowser + +Files changed: +A news/4043.tests +M Products/CMFPlone/tests/robot/test_contentbrowser.robot + +b'diff --git a/Products/CMFPlone/tests/robot/test_contentbrowser.robot b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\nindex e370ffa17c..28190b084d 100644\n--- a/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n+++ b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n@@ -16,6 +16,8 @@ Test Teardown Run keywords Plone Test Teardown\n \n ${ASSET_FOLDER} asset-folder\n ${DOCUMENT_ID} doc\n+${LINK_ID} internal-anchor\n+\n \n *** Test cases ***************************************************************\n \n@@ -66,6 +68,12 @@ Scenario: search and select an image via contentbrowser\n and I save the document\n Then the document contain the image by search\n \n+Scenario: add contenttype Link with an internal target\n+ Given a logged-in site administrator\n+ and a Link\n+ When I edit the Link\n+ Then the internal target is added\n+\n \n *** Keywords *****************************************************************\n \n@@ -107,6 +115,9 @@ a nested asset folder\n a document\n Create content type=Document id=${DOCUMENT_ID} title=My Page\n \n+a Link\n+ Create content type=Link id=${LINK_ID} title=My Link\n+\n # --- WHEN ------------------------------------------------------------------\n \n I select a related item image via contentbrowser\n@@ -215,7 +226,13 @@ I search and select an image via contentbrowser\n I save the document\n Click //button[@id="form-buttons-save"]\n \n-\n+I edit the Link\n+ Go to ${PLONE_URL}/${LINK_ID}/edit\n+ Click //div[contains(@class, "content-browser-selected-items")]/a\n+ # Click first element in first column, that is a folder\n+ Click item in contenbrowser column 1 1\n+ # Click the select Button in the Toolbar of column 2\n+ Click //div[contains(@class, "content-browser-wrapper")]//div[contains(@class, "levelColumns")]/div[2]/div[contains(@class, "levelToolbar")]/button\n \n # --- THEN ------------------------------------------------------------------\n \n@@ -239,6 +256,8 @@ the document contain the image by search\n the document contain the uploaded image\n rendered textfield contain the image with title plone-logo.png\n \n+the internal target is added\n+ Get Text //div[contains(@class, "content-browser-selected-items")]//span[@class="item-title"] should be Test Folder\n \n #--- Helper DRY -------------------------------------------------------------\n \ndiff --git a/news/4043.tests b/news/4043.tests\nnew file mode 100644\nindex 0000000000..3f1439ebd3\n--- /dev/null\n+++ b/news/4043.tests\n@@ -0,0 +1,2 @@\n+add robot test scenario for contentbrowser widget\n+[1letter]\n'