summaryrefslogtreecommitdiff
path: root/tests/admin_widgets
diff options
context:
space:
mode:
authorMatthias Kestenholz <mk@feinheit.ch>2019-02-23 16:41:56 +0100
committerTim Graham <timograham@gmail.com>2019-02-27 16:39:17 -0500
commit231b513926f2bfd71f08058ce5013bd81678ac01 (patch)
tree974917d280c6086eb25cfd1b32775b961a1edbc2 /tests/admin_widgets
parent93e892bb645b16ebaf287beb5fe7f3ffe8d10408 (diff)
downloaddjango-231b513926f2bfd71f08058ce5013bd81678ac01.tar.gz
Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient.
Thanks gasman for the tests, and codingjoe and timgraham for the review.
Diffstat (limited to 'tests/admin_widgets')
-rw-r--r--tests/admin_widgets/test_autocomplete_widget.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/admin_widgets/test_autocomplete_widget.py b/tests/admin_widgets/test_autocomplete_widget.py
index cd9d58e347..601929fd37 100644
--- a/tests/admin_widgets/test_autocomplete_widget.py
+++ b/tests/admin_widgets/test_autocomplete_widget.py
@@ -139,4 +139,4 @@ class AutocompleteMixinTests(TestCase):
else:
expected_files = base_files
with translation.override(lang):
- self.assertEqual(AutocompleteSelect(rel, admin.site).media._js, expected_files)
+ self.assertEqual(AutocompleteSelect(rel, admin.site).media._js, list(expected_files))