chore: fix column per row not been saved and added tests (#291)

Author: mrbazzan

djangocms_frontend/contrib/grid/forms.py

@@ -127,11 +127,11 @@ class Meta:
     )
 
 
-GridRowBaseForm.Meta.entangled_fields["config"] += extra_fields_column.keys()
+GridRowBaseForm._meta.entangled_fields["config"] += extra_fields_column.keys()
 
 
 GridRowForm = type(
-    "GridRowBaseForm",
+    "GridRowForm",
     (GridRowBaseForm,),
     copy(extra_fields_column),
 )
@@ -226,10 +226,10 @@ def clean(self):
         widget=forms.HiddenInput() if "{size}_me" in getattr(settings, "EXCL_COL_PROP", ()) else forms.CheckboxInput(),
     )
 
+GridColumnBaseForm._meta.entangled_fields["config"] += extra_fields_column.keys()
+
 GridColumnForm = type(
     "GridColumnForm",
     (GridColumnBaseForm,),
     copy(extra_fields_column),
 )
-
-GridColumnForm._meta.entangled_fields["config"] += extra_fields_column.keys()

tests/grid/test_forms.py

@@ -0,0 +1,44 @@
+from django.test import TestCase
+
+from djangocms_frontend.contrib.grid.forms import (
+    GridColumnForm,
+    GridRowForm,
+    GridContainerForm)
+
+
+class GridFormTestCase(TestCase):
+    def test_grid_container_form(self):
+        form = GridContainerForm(data={
+            "container_type": "container",
+            "tag_type": "div",
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+        })
+        self.assertTrue(form.is_valid())
+        self.assertIn("container_type", form.instance.config)
+        self.assertEqual(form.instance.container_type, "container")
+
+    def test_grid_row_form(self):
+        form = GridRowForm(data={
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+            "row_cols_xs": 5,
+        })
+        self.assertTrue(form.is_valid())
+        self.assertIn("row_cols_xs", form.instance.config)
+        self.assertIn("row_cols_xxl", form.instance.config)
+        self.assertEqual(form.instance.row_cols_xs, 5)
+
+    def test_grid_column_form(self):
+        form = GridColumnForm(data={
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+            "text_alignment": "",
+            "xs_col": "6",
+            "xl_offset": "",
+
+        })
+
+        self.assertTrue(form.is_valid())
+        self.assertIn("md_me", form.instance.config)
+        self.assertEqual(form.instance.xs_col, 6)

tests/test_fields.py

@@ -1,6 +1,10 @@
+from django import forms
 from django.test import TestCase
 
-from djangocms_frontend.fields import AttributesField, TagTypeField, TagTypeFormField
+from djangocms_frontend.settings import DEVICE_CHOICES
+from djangocms_frontend.fields import (
+    AttributesField, TagTypeField,
+    TagTypeFormField, DeviceChoiceField, OptionalDeviceChoiceField)
 
 
 class FieldsTestCase(TestCase):
@@ -31,3 +35,32 @@ def test_tag_type_field(self):
                 ("aside", "aside"),
             ],
         )
+
+    def test_optional_device_choice_field(self):
+        class Form(forms.Form):
+            odc = OptionalDeviceChoiceField()
+            odc_not_required = OptionalDeviceChoiceField(required=False)
+
+        form = Form(data={"odc": [size for size, _ in DEVICE_CHOICES]})
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data["odc"], None)
+
+        form_1 = Form(data={"odc": ['xs', 'sm']})
+        self.assertTrue(form_1.is_valid(), form_1.errors)
+        self.assertEqual(form_1.cleaned_data["odc"], ['xs', 'sm'])
+
+    def test_device_choice_field(self):
+        class Form(forms.Form):
+            dc = DeviceChoiceField()
+
+        class Form2(forms.Form):
+            dc_not_required = DeviceChoiceField(required=False)
+
+        form = Form(data={"dc": ["xs"]})
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data["dc"], ["xs"])
+
+        form_1 = Form2(data={})
+        self.assertFalse(form_1.is_valid())
+        self.assertFormError(form_1, "dc_not_required",
+                             ["Please select at least one device size"])