Merge pull request #332 from collective/fix_tests

Fix tests
collective · Mar 31, 2022 · e7367c1 · e7367c1
2 parents 345272f + 4469dc0
commit e7367c1
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 256 deletions.
diff --git a/src/collective/easyform/browser/fields.py b/src/collective/easyform/browser/fields.py
@@ -137,7 +137,6 @@ class ModelEditorView(BrowserView):
     title = _(u"Edit XML Fields Model")
 
     def modelSource(self):
-        import pdb; pdb.set_trace()
         return self.context.aq_parent.fields_model
 
     def authorized(self, context, request):

diff --git a/src/collective/easyform/browser/saveddata_form.pt b/src/collective/easyform/browser/saveddata_form.pt
@@ -8,6 +8,9 @@
 
   <h1 i18n:translate="">Saved Data</h1>
 
+  <p class="lead"
+     tal:content="python: view.description()"></p>
+
   <p i18n:translate="saveddata_form_description">The saved data of <strong i18n:name="formname" tal:content="view/form_title">form name</strong> stored in the adapter <strong i18n:name="adapter" tal:content="view/name"></strong></p>
 
   <div class="portalMessage"

diff --git a/src/collective/easyform/profiles/default/propertiestool.xml b/src/collective/easyform/profiles/default/propertiestool.xml
diff --git a/src/collective/easyform/profiles/uninstall/propertiestool.xml b/src/collective/easyform/profiles/uninstall/propertiestool.xml
diff --git a/src/collective/easyform/tests/attachment.rst b/src/collective/easyform/tests/attachment.rst
@@ -145,7 +145,7 @@ the file field is not listed in the mailer's showFields::
     >>> browser.getControl(name='form.widgets.attachment').add_file(BytesIO(b'file contents'), 'text/plain', 'test.txt')
     >>> browser.getControl('Submit').click()
     <sent mail from ...to ['mdummy@address.com']>
-    >>> "<body>" in portal.MailHost.msg.get_payload()
+    >>> "<body>" in portal.MailHost.msg.get_payload()[0].as_string()
     True
 
     >> browser.getControl('Reset').click()
@@ -169,13 +169,13 @@ Check saved data::
     True
     >>> ".widgets.attachment/@@download/test.txt" in browser.contents
     True
-    >>> '<input id="crud-edit-form-buttons-edit" name="crud-edit.form.buttons.edit" class="submit-widget button-field" value="Apply changes" type="submit" />' in browser.contents
+    >>> '<button type="submit" id="crud-edit-form-buttons-edit" name="crud-edit.form.buttons.edit" class="btn btn-secondary submit-widget button-field" value="Apply changes">' in browser.contents
     True
-    >>> '<input id="crud-edit-form-buttons-delete" name="crud-edit.form.buttons.delete" class="submit-widget button-field" value="Delete" type="submit" />' in browser.contents
+    >>> '<button type="submit" id="crud-edit-form-buttons-delete" name="crud-edit.form.buttons.delete" class="btn btn-secondary submit-widget button-field" value="Delete">' in browser.contents
     True
-    >>> '<input id="form-buttons-download" name="form.buttons.download" class="submit-widget button-field" value="Download" type="submit" />' in browser.contents
+    >>> '<button type="submit" id="form-buttons-download" name="form.buttons.download" class="btn btn-secondary submit-widget button-field context" value="Download">' in browser.contents
     True
-    >>> '<input id="form-buttons-clearall" name="form.buttons.clearall" class="submit-widget button-field" value="Clear all" type="submit" />' in browser.contents
+    >>> '<button type="submit" id="form-buttons-clearall" name="form.buttons.clearall" class="btn btn-secondary submit-widget button-field destructive" value="Clear all">' in browser.contents
     True
     >>> browser.getLink('test.txt').click()
     >>> browser.url

diff --git a/src/collective/easyform/tests/base.py b/src/collective/easyform/tests/base.py
@@ -53,8 +53,16 @@ def setUpZope(self, app, configurationContext):
             import plone.formwidget.recaptcha
 
             self.loadZCML(package=plone.formwidget.recaptcha)
+
         except ImportError:
             pass
+        try:
+            import plone.formwidget.hcaptcha
+
+            self.loadZCML(package=plone.formwidget.hcaptcha)
+        except ImportError:
+            pass
+
         try:
             import collective.z3cform.norobots
 
@@ -76,6 +84,8 @@ def setUpPloneSite(self, portal):
         self.applyProfile(portal, "collective.easyform:default")
         try:
             self.applyProfile(portal, "plone.formwidget.recaptcha:default")
+            self.applyProfile(portal, "plone.formwidget.hcaptcha:default")
+
         except KeyError:
             pass
         setRoles(portal, TEST_USER_ID, ["Manager"])

diff --git a/src/collective/easyform/tests/ssl.rst b/src/collective/easyform/tests/ssl.rst
@@ -36,7 +36,8 @@ Finally, let's use a new browser that isn't authenticated, and confirm that for
 who doesn't have permission to edit the form, SSL will be forced on initial form load as
 well (so the user sees a security icon in their browser.) ::
 
-    >>> browser.open(portal_url + '/testform/content_status_modify?workflow_action=publish')
+    >>> auth = browser.getControl(name='_authenticator', index=0).value
+    >>> browser.open(portal_url + f'/testform/content_status_modify?workflow_action=publish&_authenticator={auth}')
     >>> 'Item state changed' in browser.contents
     True
 

diff --git a/src/collective/easyform/tests/testControlpanel.py b/src/collective/easyform/tests/testControlpanel.py
@@ -45,11 +45,6 @@ def test_easyform_control_panel_sidebar(self):
         link = self.browser.getLink("Add-ons")
         self.assertEqual(link.url, "http://nohost/plone/prefs_install_products_form")
 
-    def test_easyform_control_panel_backlink(self):
-        self.browser.open(self.portal_url + "/@@navigation-controlpanel")
-        link = self.browser.getLink(id="setup-link")
-        self.assertEqual(link.url, "http://nohost/plone/@@overview-controlpanel")
-
 
 class ControlPanelFunctionalTestCase(base.EasyFormFunctionalTestCase):
     """Test that changes in the easyform control panel are actually

diff --git a/src/collective/easyform/tests/testCustomScript.py b/src/collective/easyform/tests/testCustomScript.py
@@ -8,7 +8,7 @@
 """
 from AccessControl import ClassSecurityInfo
 from AccessControl import Unauthorized
-from App.class_init import InitializeClass
+from AccessControl.class_init import InitializeClass
 from collective.easyform.api import get_actions
 from collective.easyform.tests import base
 from plone.app.testing import logout