diff options
| author | Matthias Kestenholz <mk@feinheit.ch> | 2019-02-23 16:41:56 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-27 17:16:58 -0500 |
| commit | 459f7c804daf9ffb3bfecee13e078926cc324dd3 (patch) | |
| tree | 6041e7891e9b5f323a9f5fcc4be366b30b3f77e7 /tests/admin_widgets | |
| parent | 77e53da127cfb5d4f0c9a3540a02ff24f04fe9e2 (diff) | |
[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.
Diffstat (limited to 'tests/admin_widgets')
| -rw-r--r-- | tests/admin_widgets/test_autocomplete_widget.py | 2 |
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)) |