Commit accee396 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Modified wrong expected ClearableFileInput rendering output in a couple of... 

Modified wrong expected ClearableFileInput rendering output in a couple of additional tests after fix introduced in [15426]. Refs #14984.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 0b8b60ca

tests/regressiontests/admin_widgets/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ class AdminFileWidgetTest(DjangoTestCase): 
        w = AdminFileWidget()

        self.assertEqual(

            conditional_escape(w.render('test', album.cover_art)),

            '<p class="file-upload">Currently: <a target="_blank" href="%(STORAGE_URL)salbums/hybrid_theory.jpg">albums\hybrid_theory.jpg</a> <span class="clearable-file-input"><input type="checkbox" name="test-clear" id="test-clear_id" /> <label for="test-clear_id">Clear</label></span><br />Change: <input type="file" name="test" /></p>' % { 'STORAGE_URL': default_storage.url('') },

            '<p class="file-upload">Currently: <a href="%(STORAGE_URL)salbums/hybrid_theory.jpg">albums\hybrid_theory.jpg</a> <span class="clearable-file-input"><input type="checkbox" name="test-clear" id="test-clear_id" /> <label for="test-clear_id">Clear</label></span><br />Change: <input type="file" name="test" /></p>' % { 'STORAGE_URL': default_storage.url('') },

        )



        self.assertEqual(

tests/regressiontests/forms/tests/widgets.py

+2 −2
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ class ClearableFileInputTests(TestCase): 
        widget = ClearableFileInput()

        widget.is_required = False

        self.assertEqual(widget.render('myfile', FakeFieldFile()),

                         u'Currently: <a target="_blank" href="something">something</a> <input type="checkbox" name="myfile-clear" id="myfile-clear_id" /> <label for="myfile-clear_id">Clear</label><br />Change: <input type="file" name="myfile" />')

                         u'Currently: <a href="something">something</a> <input type="checkbox" name="myfile-clear" id="myfile-clear_id" /> <label for="myfile-clear_id">Clear</label><br />Change: <input type="file" name="myfile" />')



    def test_clear_input_renders_only_if_not_required(self):

        """
@@ -1095,7 +1095,7 @@ class ClearableFileInputTests(TestCase): 
        widget = ClearableFileInput()

        widget.is_required = True

        self.assertEqual(widget.render('myfile', FakeFieldFile()),

                         u'Currently: <a target="_blank" href="something">something</a> <br />Change: <input type="file" name="myfile" />')

                         u'Currently: <a href="something">something</a> <br />Change: <input type="file" name="myfile" />')



    def test_clear_input_renders_only_if_initial(self):

        """