Skip to content

Commit 15f3dd5

Browse files
committed
fix tests
1 parent 5182a5b commit 15f3dd5

5 files changed

Lines changed: 19 additions & 12 deletions

File tree

src/design/plone/policy/restapi/form_data/csv.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
from collective.volto.formsupport.restapi.services.form_data.csv import FormDataExportGet as BaseFormDataExportGet
1+
from collective.volto.formsupport.restapi.services.form_data.csv import (
2+
FormDataExportGet as BaseFormDataExportGet,
3+
)
24
from io import StringIO
35

46
import csv

src/design/plone/policy/restapi/submit_form/post.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from collective.volto.formsupport import _
22
from collective.volto.formsupport.interfaces import IFormDataStore
3-
from collective.volto.formsupport.restapi.services.submit_form.post import SubmitPost as BaseSubmitPost
3+
from collective.volto.formsupport.restapi.services.submit_form.post import (
4+
SubmitPost as BaseSubmitPost,
5+
)
46
from plone import api
57
from zExceptions import BadRequest
68
from zope.component import getMultiAdapter
@@ -12,7 +14,6 @@ def reply(self):
1214
Append waiting_list to response
1315
"""
1416
res = super().reply()
15-
1617
submit_limit = int(self.block.get("limit", "-1")) # this is the patch
1718
waiting_list = (
1819
submit_limit is not None and -1 < submit_limit < self.count_data()

src/design/plone/policy/testing.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def setUpZope(self, app, configurationContext):
4040
# layer.
4141

4242
super().setUpZope(app, configurationContext)
43-
self.loadZCML(package=design.plone.policy)
4443
self.loadZCML(package=collective.feedback)
4544
self.loadZCML(package=collective.volto.formsupport)
4645
self.loadZCML(package=collective.volto.dropdownmenu)
@@ -56,6 +55,7 @@ def setUpZope(self, app, configurationContext):
5655
self.loadZCML(package=souper.plone)
5756
self.loadZCML(package=redturtle.faq)
5857
self.loadZCML(package=collective.volto.contactsblock)
58+
self.loadZCML(package=design.plone.policy)
5959

6060
def setUpPloneSite(self, portal):
6161
super().setUpPloneSite(portal)
@@ -102,9 +102,6 @@ def setUpPloneSite(self, portal):
102102
super().setUpPloneSite(portal)
103103
request = portal.REQUEST
104104
setRequest(request)
105-
import pdb
106-
107-
pdb.set_trace()
108105
applyProfile(portal, "design.plone.policy.limit_root_addables:default")
109106

110107

@@ -140,6 +137,7 @@ def setUpZope(self, app, configurationContext):
140137
self.loadZCML(package=souper.plone)
141138
self.loadZCML(package=redturtle.faq)
142139
self.loadZCML(package=collective.volto.contactsblock)
140+
self.loadZCML(package=design.plone.policy)
143141

144142
def setUpPloneSite(self, portal):
145143
super().setUpPloneSite(portal)

src/design/plone/policy/tests/test_limit_submit_form.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from collective.volto.formsupport.testing import VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING # noqa: E501,
1+
from design.plone.policy.testing import DESIGN_PLONE_POLICY_API_FUNCTIONAL_TESTING
22
from plone import api
33
from plone.app.testing import setRoles
44
from plone.app.testing import SITE_OWNER_NAME
@@ -13,7 +13,7 @@
1313

1414

1515
class TestLimitMailStore(unittest.TestCase):
16-
layer = VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING
16+
layer = DESIGN_PLONE_POLICY_API_FUNCTIONAL_TESTING
1717

1818
def setUp(self):
1919
self.app = self.layer["app"]
@@ -113,6 +113,7 @@ def test_limit_submit(self):
113113
)
114114
transaction.commit()
115115
self.assertEqual(response.status_code, 200)
116+
116117
self.assertTrue(response.json()["waiting_list"])
117118

118119
def test_unique_field(self):
@@ -156,7 +157,10 @@ def test_unique_field(self):
156157
response = self.submit_form(data=data)
157158
transaction.commit()
158159

159-
self.assertEqual(response.status_code, 500)
160+
self.assertEqual(response.status_code, 400)
160161
# test message is not fair because it's a translation, in another package
161162
message = response.json()["message"]
162-
self.assertTrue("Value not unique" in message or "non sono univoci" in message)
163+
self.assertEqual(
164+
message,
165+
'Unable to save data. The value of field "Name" is already stored in previous submissions.',
166+
)

src/design/plone/policy/tests/test_setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
"""Setup tests for this package."""
33
from design.plone.policy.testing import DESIGN_PLONE_POLICY_INTEGRATION_TESTING
4-
from design.plone.policy.testing import DESIGN_PLONE_POLICY_LIMIT_ROOT_ADDABLES_INTEGRATION_TESTING
4+
from design.plone.policy.testing import (
5+
DESIGN_PLONE_POLICY_LIMIT_ROOT_ADDABLES_INTEGRATION_TESTING,
6+
)
57
from plone import api
68
from plone.app.testing import setRoles
79
from plone.app.testing import TEST_USER_ID

0 commit comments

Comments
 (0)