Skip to content

Commit d8e41be

Browse files
committed
ruff format
1 parent 9690d62 commit d8e41be

File tree

5 files changed

+37
-16
lines changed

5 files changed

+37
-16
lines changed

djangocms_form_builder/actions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,9 @@ class Meta:
290290
def __init__(self, *args, **kwargs):
291291
super().__init__(*args, **kwargs)
292292
if args:
293-
self.fields["redirect_link"].required = get_hash(RedirectAction) in args[0].get("form_actions", [])
293+
self.fields["redirect_link"].required = get_hash(
294+
RedirectAction
295+
) in args[0].get("form_actions", [])
294296

295297
def execute(self, form, request):
296298
form.Meta.options["redirect"] = get_link(

djangocms_form_builder/entry_model.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ def get_admin_fieldsets(self):
116116
"fields": tuple(
117117
key
118118
for key, value in self.entry_data.items()
119-
if isinstance(value, (str, tuple, list, bool, decimal.Decimal, int))
119+
if isinstance(
120+
value, (str, tuple, list, bool, decimal.Decimal, int)
121+
)
120122
)
121123
},
122124
),

djangocms_form_builder/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class AjaxView(View):
5252
ajax_get(request, \*args, \*\*kwargs)
5353
Handles AJAX GET requests. Calls the `ajax_get` method of the plugin or form instance if available.
5454
"""
55+
5556
def dispatch(self, request, *args, **kwargs):
5657
if request.accepts("application/json"):
5758
if request.method == "GET" and "get" in self.http_method_names:

tests/test_actions.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ class ActionTestCase(TestFixture, CMSTestCase):
1212
def setUp(self):
1313
super().setUp()
1414
self.actions = get_registered_actions()
15-
self.save_action = [key for key, value in self.actions if value == "Save form submission"][0]
16-
self.send_mail_action = [key for key, value in self.actions if value == "Send email"][0]
15+
self.save_action = [
16+
key for key, value in self.actions if value == "Save form submission"
17+
][0]
18+
self.send_mail_action = [
19+
key for key, value in self.actions if value == "Send email"
20+
][0]
1721

1822
def test_send_mail_action(self):
1923
plugin_instance = add_plugin(
@@ -22,16 +26,19 @@ def test_send_mail_action(self):
2226
language=self.language,
2327
form_name="test_form",
2428
)
25-
plugin_instance.action_parameters = {"sendemail_recipients": "[email protected] [email protected]", "sendemail_template": "default"}
26-
plugin_instance.form_actions = f"[\"{self.send_mail_action}\"]"
29+
plugin_instance.action_parameters = {
30+
"sendemail_recipients": "[email protected] [email protected]",
31+
"sendemail_template": "default",
32+
}
33+
plugin_instance.form_actions = f'["{self.send_mail_action}"]'
2734
plugin_instance.save()
2835

2936
child_plugin = add_plugin(
3037
placeholder=self.placeholder,
3138
plugin_type="CharFieldPlugin",
3239
language=self.language,
3340
target=plugin_instance,
34-
config={"field_name": "field1"}
41+
config={"field_name": "field1"},
3542
)
3643
child_plugin.save()
3744
plugin_instance.child_plugin_instances = [child_plugin]
@@ -49,12 +56,15 @@ def test_send_mail_action(self):
4956
# Validate send_mail call
5057
mock_send_mail.assert_called_once()
5158
args, kwargs = mock_send_mail.call_args
52-
self.assertEqual(args[0], 'Test form form submission')
53-
self.assertIn('Form submission', args[1])
54-
self.assertEqual(args[3], ['[email protected]', '[email protected]'])
59+
self.assertEqual(args[0], "Test form form submission")
60+
self.assertIn("Form submission", args[1])
61+
self.assertEqual(args[3], ["[email protected]", "[email protected]"])
5562

5663
# Test with no recipients
57-
plugin_instance.action_parameters = {"sendemail_recipients": "", "sendemail_template": "default"}
64+
plugin_instance.action_parameters = {
65+
"sendemail_recipients": "",
66+
"sendemail_template": "default",
67+
}
5868
plugin_instance.save()
5969

6070
with patch("django.core.mail.mail_admins") as mock_mail_admins:
@@ -65,5 +75,5 @@ def test_send_mail_action(self):
6575
# Validate mail_admins call
6676
mock_mail_admins.assert_called_once()
6777
args, kwargs = mock_mail_admins.call_args
68-
self.assertEqual(args[0], 'Test form form submission')
69-
self.assertIn('Form submission', args[1])
78+
self.assertEqual(args[0], "Test form form submission")
79+
self.assertIn("Form submission", args[1])

tests/test_form_registry.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ def test_registry(self):
2525
self.assertEqual(registered_forms[0][0], "No forms registered")
2626
forms_form = FormsForm()
2727
# No forms to select: hide field in form plugin admin form
28-
self.assertIsInstance(forms_form.fields["form_selection"].widget, forms.HiddenInput)
28+
self.assertIsInstance(
29+
forms_form.fields["form_selection"].widget, forms.HiddenInput
30+
)
2931

3032
register_with_form_builder(MyTestForm)
3133

3234
registered_forms = get_registered_forms()
3335
self.assertEqual(len(registered_forms), 1) # one form
34-
self.assertEqual(registered_forms[0][1], "My Test Form") # derived from the class name
36+
self.assertEqual(
37+
registered_forms[0][1], "My Test Form"
38+
) # derived from the class name
3539
forms_form = FormsForm()
3640
# Form registered: Select widget in form plugin admin form
3741
self.assertIsInstance(forms_form.fields["form_selection"].widget, forms.Select)
@@ -40,4 +44,6 @@ def test_registry(self):
4044

4145
registered_forms = get_registered_forms()
4246
self.assertEqual(len(registered_forms), 2) # second form
43-
self.assertEqual(registered_forms[1][1], "This form has a custom name") # attribute-driven
47+
self.assertEqual(
48+
registered_forms[1][1], "This form has a custom name"
49+
) # attribute-driven

0 commit comments

Comments
 (0)