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_inlines/tests.py | |
| 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_inlines/tests.py')
| -rw-r--r-- | tests/admin_inlines/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 0a1ab5acbb..5272d44f35 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -497,10 +497,10 @@ class TestInlineMedia(TestDataMixin, TestCase): response.context['inline_admin_formsets'][0].media._js, [ 'admin/js/vendor/jquery/jquery.min.js', - 'admin/js/jquery.init.js', - 'admin/js/inlines.min.js', 'my_awesome_inline_scripts.js', 'custom_number.js', + 'admin/js/jquery.init.js', + 'admin/js/inlines.min.js', ] ) self.assertContains(response, 'my_awesome_inline_scripts.js') |