From e703b93a656b78b9b444bb3a9980e305ed002a70 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Wed, 11 Dec 2019 00:49:54 -0800 Subject: Fixed #31080 -- Removed redundant type="text/javascript" attribute from - -""" + + +""" ) self.assertEqual( repr(m), @@ -40,9 +40,9 @@ class FormsMediaTestCase(SimpleTestCase): str(m3), """ - - -""" + + +""" ) # A widget can exist without a media definition @@ -72,9 +72,9 @@ class FormsMediaTestCase(SimpleTestCase): str(w1.media), """ - - -""" + + +""" ) # Media objects can be interrogated by media type @@ -86,9 +86,9 @@ class FormsMediaTestCase(SimpleTestCase): self.assertEqual( str(w1.media['js']), - """ - -""" + """ + +""" ) def test_combine_media(self): @@ -123,10 +123,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) # media addition hasn't affected the original objects @@ -134,9 +134,9 @@ class FormsMediaTestCase(SimpleTestCase): str(w1.media), """ - - -""" + + +""" ) # Regression check for #12879: specifying the same CSS or JS file @@ -149,7 +149,7 @@ class FormsMediaTestCase(SimpleTestCase): w4 = MyWidget4() self.assertEqual(str(w4.media), """ -""") +""") def test_media_deduplication(self): # A deduplication test applied directly to a Media object, to confirm @@ -160,7 +160,7 @@ class FormsMediaTestCase(SimpleTestCase): js=('/path/to/js1', '/path/to/js1'), ) self.assertEqual(str(media), """ -""") +""") def test_media_property(self): ############################################################### @@ -175,7 +175,7 @@ class FormsMediaTestCase(SimpleTestCase): w4 = MyWidget4() self.assertEqual(str(w4.media), """ -""") +""") # Media properties can reference the media of their parents class MyWidget5(MyWidget4): @@ -186,8 +186,8 @@ class FormsMediaTestCase(SimpleTestCase): w5 = MyWidget5() self.assertEqual(str(w5.media), """ - -""") + +""") def test_media_property_parent_references(self): # Media properties can reference the media of their parents, @@ -210,10 +210,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) def test_media_inheritance(self): @@ -237,9 +237,9 @@ class FormsMediaTestCase(SimpleTestCase): str(w7.media), """ - - -""" + + +""" ) # If a widget extends another but defines media, it extends the parent widget's media by default @@ -256,10 +256,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) def test_media_inheritance_from_property(self): @@ -289,8 +289,8 @@ class FormsMediaTestCase(SimpleTestCase): str(w9.media), """ - -""" + +""" ) # A widget can disable media inheritance by specifying 'extend=False' @@ -305,8 +305,8 @@ class FormsMediaTestCase(SimpleTestCase): w10 = MyWidget10() self.assertEqual(str(w10.media), """ - -""") + +""") def test_media_inheritance_extends(self): # A widget can explicitly enable full media inheritance by specifying 'extend=True' @@ -331,10 +331,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) def test_media_inheritance_single_type(self): @@ -360,8 +360,8 @@ class FormsMediaTestCase(SimpleTestCase): """ - -""" + +""" ) def test_multi_media(self): @@ -386,8 +386,8 @@ class FormsMediaTestCase(SimpleTestCase): - -""" + +""" ) def test_multi_widget(self): @@ -429,10 +429,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) def test_form_media(self): @@ -471,10 +471,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) # Form media can be combined to produce a single media definition. @@ -486,10 +486,10 @@ class FormsMediaTestCase(SimpleTestCase): """ - - - -""" + + + +""" ) # Forms can also define media, following the same rules as widgets. @@ -509,21 +509,21 @@ class FormsMediaTestCase(SimpleTestCase): - - - - -""" + + + + +""" ) # Media works in templates self.assertEqual( Template("{{ form.media.js }}{{ form.media.css }}").render(Context({'form': f3})), - """ - - - -""" + """ + + + +""" """ diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index e264b6df77..8259b3b8bd 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -2386,7 +2386,7 @@ class OtherModelFormTests(TestCase): self.assertHTMLEqual( str(f.media), ''' -''' +''' ) def test_choices_type(self): diff --git a/tests/staticfiles_tests/test_forms.py b/tests/staticfiles_tests/test_forms.py index 0178bab931..1fbcbe164c 100644 --- a/tests/staticfiles_tests/test_forms.py +++ b/tests/staticfiles_tests/test_forms.py @@ -31,8 +31,8 @@ class StaticFilesFormsMediaTestCase(SimpleTestCase): str(m), """ - - - -""" + + + +""" ) diff --git a/tests/templates/custom_admin/change_list.html b/tests/templates/custom_admin/change_list.html index eebc9c7e30..bb6f43748e 100644 --- a/tests/templates/custom_admin/change_list.html +++ b/tests/templates/custom_admin/change_list.html @@ -1,7 +1,7 @@ {% extends "admin/change_list.html" %} {% block extrahead %} - {% endblock %} diff --git a/tests/utils_tests/files/strip_tags1.html b/tests/utils_tests/files/strip_tags1.html index 5e191f31fd..1e09134e81 100644 --- a/tests/utils_tests/files/strip_tags1.html +++ b/tests/utils_tests/files/strip_tags1.html @@ -24,8 +24,8 @@ - - + + diff --git a/tests/view_tests/templates/jsi18n-multi-catalogs.html b/tests/view_tests/templates/jsi18n-multi-catalogs.html index 8ec902e1c7..11b84d0bfa 100644 --- a/tests/view_tests/templates/jsi18n-multi-catalogs.html +++ b/tests/view_tests/templates/jsi18n-multi-catalogs.html @@ -1,15 +1,15 @@ - - + +

-

-

diff --git a/tests/view_tests/templates/jsi18n.html b/tests/view_tests/templates/jsi18n.html index f0bd17c199..40ae8e7221 100644 --- a/tests/view_tests/templates/jsi18n.html +++ b/tests/view_tests/templates/jsi18n.html @@ -1,11 +1,11 @@ - +

-

-

-

-

-

-

-

-- cgit v1.3