From f19892f01183d41248b28edeae6b2a70b22a35e3 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 13:57:18 +0200
Subject: [PATCH 1/7] update config with plone/meta

---
 .gitignore              |  2 --
 .meta.toml              |  3 +--
 .pre-commit-config.yaml | 10 +++++-----
 pyproject.toml          |  3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b231e87..67c7616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@ parts/
 pyvenv.cfg
 var/
 local.cfg
-.python-version
 
 # mxdev
 /instance/
@@ -47,7 +46,6 @@ local.cfg
 /venv/
 .installed.txt
 
-robot_*
 test_*
 forest.*
 
diff --git a/.meta.toml b/.meta.toml
index 1414a7f..586b902 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "721299ce"
+commit-id = "5d22fbf8"
 
 [pyproject]
 codespell_skip = "*.js,*.min.js,*.min.js.map,*.min.css.map,*.svg,*.lock,*.json"
@@ -17,7 +17,6 @@ jobs = [
 
 [gitignore]
 extra_lines = """
-robot_*
 test_*
 forest.*
 """
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d60054b..1460326 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.17.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -16,7 +16,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
     -   id: flake8
 
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -71,7 +71,7 @@ repos:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.2.0"
+    rev: "6.2.1"
     hooks:
     -   id: i18ndude
 
diff --git a/pyproject.toml b/pyproject.toml
index 59cb531..9947b68 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,"
+ignore-words-list = "discreet,assertin,"
 skip = "*.po,*.js,*.min.js,*.min.js.map,*.min.css.map,*.svg,*.lock,*.json"
 ##
 # Add extra configuration options in .meta.toml:
@@ -83,6 +83,7 @@ Zope = [
   'Products.CMFCore', 'Products.CMFDynamicViewFTI',
 ]
 python-dateutil = ['dateutil']
+pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
 
 ##
 # Add extra configuration options in .meta.toml:

From 5ea7efb860bb4d8c7672148ce8d144f1dfbb157e Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 13:58:27 +0200
Subject: [PATCH 2/7] Update config

---
 .gitignore | 1 -
 .meta.toml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 67c7616..fc71f6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ local.cfg
 /venv/
 .installed.txt
 
-test_*
 forest.*
 
 ##
diff --git a/.meta.toml b/.meta.toml
index 586b902..d6b0222 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -17,6 +17,5 @@ jobs = [
 
 [gitignore]
 extra_lines = """
-test_*
 forest.*
 """

From f26a7003f1d0d6c719506cc756310e797bbaa87e Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 13:59:09 +0200
Subject: [PATCH 3/7] Fix attribute rendering "multiple" in orderselect widget

---
 src/collective/taxonomy/widget_input.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/collective/taxonomy/widget_input.pt b/src/collective/taxonomy/widget_input.pt
index 8001fd9..0045dde 100644
--- a/src/collective/taxonomy/widget_input.pt
+++ b/src/collective/taxonomy/widget_input.pt
@@ -150,7 +150,7 @@ function selectionError() {
       <td>
         <select class=""
                 id="from"
-                multiple
+                multiple=""
                 name="from"
                 size="5"
                 style="width: 100%"

From 5fff65dd8e57acb1fc0f438983cfdf39d4707fbb Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 13:59:17 +0200
Subject: [PATCH 4/7] add robot test

---
 .../taxonomy/tests/robot/test_taxonomy.robot  |  78 +++++++++++++
 .../tests/robot/todo_test_taxonomy.robot      | 105 ------------------
 2 files changed, 78 insertions(+), 105 deletions(-)
 create mode 100644 src/collective/taxonomy/tests/robot/test_taxonomy.robot
 delete mode 100644 src/collective/taxonomy/tests/robot/todo_test_taxonomy.robot

diff --git a/src/collective/taxonomy/tests/robot/test_taxonomy.robot b/src/collective/taxonomy/tests/robot/test_taxonomy.robot
new file mode 100644
index 0000000..c1b2e1a
--- /dev/null
+++ b/src/collective/taxonomy/tests/robot/test_taxonomy.robot
@@ -0,0 +1,78 @@
+*** Settings ***
+
+Resource    plone/app/robotframework/browser.robot
+
+Library    Remote    ${PLONE_URL}/RobotRemote
+Library    Collections
+
+Test Setup    Run Keywords    Plone test setup
+Test Teardown    Run keywords     Plone test teardown
+
+
+*** Variables ***
+
+${TITLE}    An edited page
+${PAGE_ID}    an-edited-page
+
+
+*** Test Cases ***
+
+Scenario: As a manager I can add a taxonomy
+  Given a logged in manager
+    and an page type with a taxonomy
+   When I edit the page
+    and I select multiple options
+   Then I see '2' selected options
+
+   When I save the page
+    and I edit the page
+    and I deselect option 'Information Science'
+   Then I see '1' selected options
+
+*** Keywords ***
+
+# Given
+
+a logged in manager
+    Enable autologin as    Manager
+
+an page type with a taxonomy
+    Create content
+    ...    type=Document
+    ...    title=${TITLE}
+
+    Go to    ${PLONE_URL}/dexterity-types/Document/@@behaviors
+    Check Checkbox    //input[@name="form.widgets.collective.taxonomy.generated.test:list"]
+    Click    //button[@name="form.buttons.apply"]
+    Wait For Condition    Text    //body   contains    Behaviors successfully updated.
+
+# When
+I edit the page
+    Go to    ${PLONE_URL}/${PAGE_ID}/edit
+    Get Text    //body    contains    Edit Page
+
+I select multiple options
+    Select Options By    //select[@name="form.widgets.test.taxonomy_test.from"]    index    0    2
+    Click    //button[@name="from2toButton"]
+
+I save the page
+    Click    //button[@name="form.buttons.save"]
+    Wait For Condition    Text    //body    contains    Changes saved
+
+I deselect option '${label}'
+    Select Options By    //select[@name="form.widgets.test.taxonomy_test.to"]    label    ${label}
+    Click    //button[@name="to2fromButton"]
+
+# Then
+I see '${count}' selected options
+    Get Element Count    //select[@name="form.widgets.test.taxonomy_test.to"]/option    should be    ${count}
+
+# Misc
+
+Pause
+    [Documentation]  Visually pause test execution with interactive dialog by
+    ...              importing **Dialogs**-library and calling its
+    ...              **Pause Execution**-keyword.
+    Import library  Dialogs
+    Pause execution
+
diff --git a/src/collective/taxonomy/tests/robot/todo_test_taxonomy.robot b/src/collective/taxonomy/tests/robot/todo_test_taxonomy.robot
deleted file mode 100644
index 71a88b9..0000000
--- a/src/collective/taxonomy/tests/robot/todo_test_taxonomy.robot
+++ /dev/null
@@ -1,105 +0,0 @@
-# ============================================================================
-# EXAMPLE ROBOT TESTS
-# ============================================================================
-#
-# Run this robot test stand-alone:
-#
-#  $ bin/test -s collective.taxonomy -t test_taxonomy.robot --all
-#
-# Run this robot test with robot server (which is faster):
-#
-# 1) Start robot server:
-#
-# $ bin/robot-server --reload-path src collective.solr.testing.COLLECTIVE_SOLR_ROBOT_TESTING
-#
-# 2) Run robot tests:
-#
-# $ bin/robot src/collective/solr/tests/robot/test_search.robot
-#
-# See the http://docs.plone.org for further details (search for robot
-# framework).
-#
-# ============================================================================
-
-*** Settings *****************************************************************
-
-Resource  plone/app/robotframework/selenium.robot
-Resource  plone/app/robotframework/keywords.robot
-Resource  Products/CMFPlone/tests/robot/keywords.robot
-
-Library  Remote  ${PLONE_URL}/RobotRemote
-Library  DateTime
-
-Test Setup  TestSetup
-Test Teardown  TestTeardown
-
-*** Variables ***
-
-${BROWSER}  chrome
-
-
-*** Test Cases ***************************************************************
-
-Scenario: As a manager I can add a taxonomy
-  Given a logged in manager
-   When I search for 'Colorless Green Ideas'
-   Then the search returns '1' results
-    and the search results should include 'Colorless Green Ideas'
-
-*** Keywords *****************************************************************
-
-# Test Setup/Teardown
-
-TestSetup
-  Open test browser
-#  a logged in Manager
-
-
-TestTeardown
-#  a logged in Manager
-  Close all browsers
-
-
-# Given
-
-a logged in manager
-  Enable autologin as  Manager
-
-
-# When
-
-I search for '${searchterm}'
-  Go to  ${PLONE_URL}/@@search
-  Input text  xpath=//main//input[@name='SearchableText']  ${searchterm}
-
-I filter the search by portal type '${portal_type}'
-  Click Element  xpath=//button[@id='search-filter-toggle']
-  Wait until page contains element  xpath=//input[@id='query-portaltype-Collection']
-  Unselect Checkbox  xpath=//input[@id='query-portaltype-Collection']
-  Unselect Checkbox  xpath=//input[@id='query-portaltype-Document']
-
-I filter the search by creation date '${date_filter}'
-  Click Element  xpath=//button[@id='search-filter-toggle']
-  Wait until page contains element  xpath=//input[@id='query-portaltype-Collection']
-  Select Radio Button  created  query-date-${date_filter}
-
-# Then
-
-the search returns '${result_count}' results
-  Wait until keyword succeeds  5s  1s  XPath Should Match X Times  //strong[@id='search-results-number' and contains(.,'${result_count}')]  1  The search should have returned '${result_count}' results.
-
-the search results should include '${term}'
-  Wait until page contains element  xpath=//ol[@class='searchResults']
-  Page should contain  ${term}
-  XPath Should Match X Times  //div[@id='search-results']//ol//li//a[contains(., '${term}')]  1  Search results should have contained '${term}'.
-
-the search results should not include '${term}'
-  Wait until page contains  Search results
-  Page should not contain element  xpath=//*[@class='searchResults']/a[contains(text(), '${term}')]
-
-
-# Misc
-
-Capture screenshot
-  [Arguments]  ${filename}
-  Capture Page Screenshot  filename=../../../../docs/_screenshots/${filename}

From 0acddfb3287ea5e64709c03be098fdaacc18557f Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 14:02:24 +0200
Subject: [PATCH 5/7] run lint

---
 src/collective/taxonomy/widget_input.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/collective/taxonomy/widget_input.pt b/src/collective/taxonomy/widget_input.pt
index 0045dde..8001fd9 100644
--- a/src/collective/taxonomy/widget_input.pt
+++ b/src/collective/taxonomy/widget_input.pt
@@ -150,7 +150,7 @@ function selectionError() {
       <td>
         <select class=""
                 id="from"
-                multiple=""
+                multiple
                 name="from"
                 size="5"
                 style="width: 100%"

From 9e99cf432c8acfb5c5bbb2554a772dbe8522d2a4 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 16 Oct 2024 20:45:52 +0200
Subject: [PATCH 6/7] remove attribute from template

---
 src/collective/taxonomy/widget_input.pt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/collective/taxonomy/widget_input.pt b/src/collective/taxonomy/widget_input.pt
index 8001fd9..a1dd5c6 100644
--- a/src/collective/taxonomy/widget_input.pt
+++ b/src/collective/taxonomy/widget_input.pt
@@ -150,7 +150,6 @@ function selectionError() {
       <td>
         <select class=""
                 id="from"
-                multiple
                 name="from"
                 size="5"
                 style="width: 100%"

From 759181d629fb3da19cdee066bad389f75e6cb3e7 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 17 Oct 2024 08:28:59 +0200
Subject: [PATCH 7/7] Fix attribute rendering "multiple" in orderselect widget

---
 src/collective/taxonomy/widget_input.pt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/collective/taxonomy/widget_input.pt b/src/collective/taxonomy/widget_input.pt
index a1dd5c6..0a742d6 100644
--- a/src/collective/taxonomy/widget_input.pt
+++ b/src/collective/taxonomy/widget_input.pt
@@ -213,7 +213,6 @@ function selectionError() {
       <td style="text-align: right">
         <select class=""
                 id="to"
-                multiple
                 name="to"
                 size="5"
                 style="width: 100%"