Log changes. Fix tests.

collective · Jul 13, 2021 · 26bc43a · 26bc43a
1 parent 00d481d
commit 26bc43a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -22,6 +22,8 @@ Changelog
   [odelaere]
 - Ensure CUSTOM_TMP directory exists before rendering a document.
   [odelaere]
+- Allow templates selection on the search result before applying the replace.
+  [sdelcourt]
 
 3.21 (2021-04-20)
 -----------------

diff --git a/src/collective/documentgenerator/tests/test_search_replace.py b/src/collective/documentgenerator/tests/test_search_replace.py
@@ -310,7 +310,7 @@ def test_search_replace_control_panel_can_replace(self):
         ]
         form_data = {"selected_templates": selected_templates_mock, "replacements": replacements_mock}
 
-        view.form_instance.perform_replacements(form_data)
+        view.form_instance.perform_replacements(form_data, selected_templates_mock)
         view()
 
     def test_search_replace_control_panel_regex_validator(self):

diff --git a/src/collective/documentgenerator/tests/test_vocabulary.py b/src/collective/documentgenerator/tests/test_vocabulary.py
@@ -142,4 +142,13 @@ def test_all_pod_templates_vocabulary(self):
         voc_name = 'collective.documentgenerator.AllPODTemplateWithFile'
         vocabulary = queryUtility(IVocabularyFactory, voc_name)
         voc = vocabulary(self.portal)
-        self.assertEquals(len(voc), 8)
+        self.assertEquals(len(voc), 9)
+
+    def test_all_value_in_all_pod_templates_vocabulary(self):
+        """
+        Test the 'all' value is in the AllPODTemplate vocabulary.
+        """
+        voc_name = 'collective.documentgenerator.AllPODTemplateWithFile'
+        vocabulary = queryUtility(IVocabularyFactory, voc_name)
+        voc = vocabulary(self.portal)
+        self.assertIn('all', voc)