Skip to content

Commit ee8b195

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

1 file changed

Lines changed: 20 additions & 16 deletions

File tree

app/tests/cases_tests/test_widget.py

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,19 @@ 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)
4849
parsed_value_for_empty_data = field.widget.value_from_datadict(
49-
data=QueryDict(""), name=ci.slug, files={}
50+
data=QueryDict(""), name=prefixed_interface_slug, files={}
5051
)
5152
decompressed_value_for_missing_value = field.widget.decompress(value=None)
5253
assert parsed_value_for_empty_data == [None, None]
5354
assert decompressed_value_for_missing_value == [None, None]
5455

5556
parsed_value_for_image_with_permission = field.widget.value_from_datadict(
56-
data=QueryDict(urlencode({ci.slug: im1.pk})), name=ci.slug, files={}
57+
data=QueryDict(urlencode({prefixed_interface_slug: im1.pk})),
58+
name=prefixed_interface_slug,
59+
files={},
5760
)
5861
decompressed_value_for_image_with_permission = field.widget.decompress(
5962
[im1.pk]
@@ -71,8 +74,8 @@ def test_flexible_image_field_validation():
7174

7275
parsed_value_for_image_without_permission = (
7376
field.widget.value_from_datadict(
74-
data=QueryDict(urlencode({ci.slug: im2.pk})),
75-
name=ci.slug,
77+
data=QueryDict(urlencode({prefixed_interface_slug: im2.pk})),
78+
name=prefixed_interface_slug,
7679
files={},
7780
)
7881
)
@@ -89,10 +92,10 @@ def test_flexible_image_field_validation():
8992

9093
datadict = QueryDict(mutable=True)
9194
for id in [upload1.pk, upload2.pk]:
92-
datadict.appendlist(ci.slug, str(id))
95+
datadict.appendlist(prefixed_interface_slug, str(id))
9396
parsed_value_for_upload_from_user = field.widget.value_from_datadict(
9497
data=datadict,
95-
name=ci.slug,
98+
name=prefixed_interface_slug,
9699
files={},
97100
)
98101
decompressed_value_for_upload_from_user = field.widget.decompress(
@@ -109,8 +112,8 @@ def test_flexible_image_field_validation():
109112

110113
parsed_value_from_upload_from_other_user = (
111114
field.widget.value_from_datadict(
112-
data=QueryDict(urlencode({ci.slug: upload3.pk})),
113-
name=ci.slug,
115+
data=QueryDict(urlencode({prefixed_interface_slug: upload3.pk})),
116+
name=prefixed_interface_slug,
114117
files={},
115118
)
116119
)
@@ -126,8 +129,8 @@ def test_flexible_image_field_validation():
126129
field.clean(parsed_value_from_upload_from_other_user)
127130

128131
parsed_value_for_missing_value = field.widget.value_from_datadict(
129-
data=QueryDict(urlencode({ci.slug: "IMAGE_UPLOAD"})),
130-
name=ci.slug,
132+
data=QueryDict(urlencode({prefixed_interface_slug: "IMAGE_UPLOAD"})),
133+
name=prefixed_interface_slug,
131134
files={},
132135
)
133136
decompressed_value_for_missing_value = field.widget.decompress(
@@ -179,6 +182,7 @@ def test_flexible_image_widget_prepopulated_value():
179182
def test_dicom_upload_field_validation():
180183
user = UserFactory()
181184
ci = ComponentInterfaceFactory()
185+
prefixed_interface_slug = f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}"
182186
field = DICOMUploadField(user=user)
183187
upload1 = UserUploadFactory(creator=user)
184188
upload1.status = UserUpload.StatusChoices.COMPLETED
@@ -193,12 +197,12 @@ def test_dicom_upload_field_validation():
193197
)
194198
parsed_value_for_upload_from_user = field.widget.value_from_datadict(
195199
data={
196-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[1]}": [
200+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[1]}": [
197201
str(upload1.pk)
198202
],
199-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image",
203+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image",
200204
},
201-
name=f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}",
205+
name=f"{prefixed_interface_slug}",
202206
files={},
203207
)
204208
decompressed_value_for_upload_from_user = field.widget.decompress(
@@ -217,12 +221,12 @@ def test_dicom_upload_field_validation():
217221
)
218222
parsed_value_from_upload_from_other_user = field.widget.value_from_datadict(
219223
data={
220-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[1]}": [
224+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[1]}": [
221225
str(upload2.pk)
222226
],
223-
f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image_2",
227+
f"{prefixed_interface_slug}_{DICOMUploadWidgetSuffixes[0]}": "test_image_2",
224228
},
225-
name=f"{INTERFACE_FORM_FIELD_PREFIX}{ci.slug}",
229+
name=f"{prefixed_interface_slug}",
226230
files={},
227231
)
228232
decompressed_value_for_upload_from_other_user = field.widget.decompress(

0 commit comments

Comments
 (0)