Skip to content

Commit 8f729e8

Browse files
committed
Clean up cases test_widget
1 parent 8d3ba23 commit 8f729e8

1 file changed

Lines changed: 32 additions & 22 deletions

File tree

app/tests/cases_tests/test_widget.py

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,24 @@ def test_flexible_image_field_validation():
4444
im1, im2 = ImageFactory.create_batch(2)
4545
assign_perm("cases.view_image", user, im1)
4646
ci = ComponentInterfaceFactory(kind=ComponentInterface.Kind.PANIMG_IMAGE)
47+
prefixed_interface_slug = f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}"
4748
field = FlexibleImageField(user=user)
49+
4850
parsed_value_for_empty_data = field.widget.value_from_datadict(
49-
data=QueryDict(""), name=ci.slug, files={}
51+
data=QueryDict(""), name=prefixed_interface_slug, files={}
5052
)
5153
decompressed_value_for_missing_value = field.widget.decompress(value=None)
52-
assert parsed_value_for_empty_data == [None, None]
53-
assert decompressed_value_for_missing_value == [None, None]
54+
55+
assert (
56+
parsed_value_for_empty_data
57+
== decompressed_value_for_missing_value
58+
== [None, None]
59+
)
5460

5561
parsed_value_for_image_with_permission = field.widget.value_from_datadict(
56-
data=QueryDict(urlencode({ci.slug: im1.pk})), name=ci.slug, files={}
62+
data=QueryDict(urlencode({prefixed_interface_slug: im1.pk})),
63+
name=prefixed_interface_slug,
64+
files={},
5765
)
5866
decompressed_value_for_image_with_permission = field.widget.decompress(
5967
[im1.pk]
@@ -62,23 +70,21 @@ def test_flexible_image_field_validation():
6270
assert (
6371
parsed_value_for_image_with_permission
6472
== decompressed_value_for_image_with_permission
65-
== [
66-
str(im1.pk),
67-
None,
68-
]
73+
== [str(im1.pk), None]
6974
)
7075
assert field.clean(parsed_value_for_image_with_permission) == im1
7176

7277
parsed_value_for_image_without_permission = (
7378
field.widget.value_from_datadict(
74-
data=QueryDict(urlencode({ci.slug: im2.pk})),
75-
name=ci.slug,
79+
data=QueryDict(urlencode({prefixed_interface_slug: im2.pk})),
80+
name=prefixed_interface_slug,
7681
files={},
7782
)
7883
)
7984
decompressed_value_for_image_without_permission = field.widget.decompress(
8085
[im2.pk]
8186
)
87+
8288
assert (
8389
parsed_value_for_image_without_permission
8490
== decompressed_value_for_image_without_permission
@@ -89,15 +95,16 @@ def test_flexible_image_field_validation():
8995

9096
datadict = QueryDict(mutable=True)
9197
for id in [upload1.pk, upload2.pk]:
92-
datadict.appendlist(ci.slug, str(id))
98+
datadict.appendlist(prefixed_interface_slug, str(id))
9399
parsed_value_for_upload_from_user = field.widget.value_from_datadict(
94100
data=datadict,
95-
name=ci.slug,
101+
name=prefixed_interface_slug,
96102
files={},
97103
)
98104
decompressed_value_for_upload_from_user = field.widget.decompress(
99105
[str(upload1.pk), str(upload2.pk)]
100106
)
107+
101108
assert (
102109
parsed_value_for_upload_from_user
103110
== decompressed_value_for_upload_from_user
@@ -109,14 +116,15 @@ def test_flexible_image_field_validation():
109116

110117
parsed_value_from_upload_from_other_user = (
111118
field.widget.value_from_datadict(
112-
data=QueryDict(urlencode({ci.slug: upload3.pk})),
113-
name=ci.slug,
119+
data=QueryDict(urlencode({prefixed_interface_slug: upload3.pk})),
120+
name=prefixed_interface_slug,
114121
files={},
115122
)
116123
)
117124
decompressed_value_for_upload_from_other_user = field.widget.decompress(
118125
[str(upload3.pk)]
119126
)
127+
120128
assert (
121129
parsed_value_from_upload_from_other_user
122130
== decompressed_value_for_upload_from_other_user
@@ -126,13 +134,14 @@ def test_flexible_image_field_validation():
126134
field.clean(parsed_value_from_upload_from_other_user)
127135

128136
parsed_value_for_missing_value = field.widget.value_from_datadict(
129-
data=QueryDict(urlencode({ci.slug: "IMAGE_UPLOAD"})),
130-
name=ci.slug,
137+
data=QueryDict(urlencode({prefixed_interface_slug: "IMAGE_UPLOAD"})),
138+
name=prefixed_interface_slug,
131139
files={},
132140
)
133141
decompressed_value_for_missing_value = field.widget.decompress(
134142
["IMAGE_UPLOAD"]
135143
)
144+
136145
assert (
137146
parsed_value_for_missing_value
138147
== decompressed_value_for_missing_value
@@ -179,6 +188,7 @@ def test_flexible_image_widget_prepopulated_value():
179188
def test_dicom_upload_field_validation():
180189
user = UserFactory()
181190
ci = ComponentInterfaceFactory()
191+
prefixed_interface_slug = f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}"
182192
field = DICOMUploadField(user=user)
183193
upload1 = UserUploadFactory(creator=user)
184194
upload1.status = UserUpload.StatusChoices.COMPLETED
@@ -193,12 +203,12 @@ def test_dicom_upload_field_validation():
193203
)
194204
parsed_value_for_upload_from_user = field.widget.value_from_datadict(
195205
data={
196-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[1]}": [
206+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[1]}": [
197207
str(upload1.pk)
198208
],
199-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image",
209+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image",
200210
},
201-
name=f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}",
211+
name=f"{prefixed_interface_slug}",
202212
files={},
203213
)
204214
decompressed_value_for_upload_from_user = field.widget.decompress(
@@ -217,12 +227,12 @@ def test_dicom_upload_field_validation():
217227
)
218228
parsed_value_from_upload_from_other_user = field.widget.value_from_datadict(
219229
data={
220-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[1]}": [
230+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[1]}": [
221231
str(upload2.pk)
222232
],
223-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image_2",
233+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image_2",
224234
},
225-
name=f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}",
235+
name=f"{prefixed_interface_slug}",
226236
files={},
227237
)
228238
decompressed_value_for_upload_from_other_user = field.widget.decompress(

0 commit comments

Comments
 (0)