From 459f7c804daf9ffb3bfecee13e078926cc324dd3 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Sat, 23 Feb 2019 16:41:56 +0100 Subject: [2.2.x] Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient. Thanks gasman for the tests, and codingjoe and timgraham for the review. Backport of 231b513926f2bfd71f08058ce5013bd81678ac01 from master. --- tests/admin_widgets/test_autocomplete_widget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/admin_widgets/test_autocomplete_widget.py') 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)) -- cgit v1.3