From 55c3133df86447129d5c912102f3c4f7b56092c6 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 14 May 2016 10:31:32 -0400
Subject: [PATCH] Simplified a ClearableFileInput test.

---
 .../widget_tests/test_clearablefileinput.py   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/forms_tests/widget_tests/test_clearablefileinput.py b/tests/forms_tests/widget_tests/test_clearablefileinput.py
index 5c093dbd46..46bad58f3a 100644
--- a/tests/forms_tests/widget_tests/test_clearablefileinput.py
+++ b/tests/forms_tests/widget_tests/test_clearablefileinput.py
@@ -1,6 +1,5 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import ClearableFileInput
-from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 
 from .base import WidgetTest
@@ -47,15 +46,15 @@ class ClearableFileInputTest(WidgetTest):
             def __str__(self):
                 return '''something<div onclick="alert('oops')">.jpg'''
 
-        widget = ClearableFileInput()
-        field = StrangeFieldFile()
-        output = widget.render('my<div>file', field)
-        self.assertNotIn(field.url, output)
-        self.assertIn('href="something?chapter=1&amp;sect=2&amp;copy=3&amp;lang=en"', output)
-        self.assertNotIn(six.text_type(field), output)
-        self.assertIn('something&lt;div onclick=&quot;alert(&#39;oops&#39;)&quot;&gt;.jpg', output)
-        self.assertIn('my&lt;div&gt;file', output)
-        self.assertNotIn('my<div>file', output)
+        self.check_html(ClearableFileInput(), 'my<div>file', StrangeFieldFile(), html=(
+            """
+            Currently: <a href="something?chapter=1&amp;sect=2&amp;copy=3&amp;lang=en">
+            something&lt;div onclick=&quot;alert(&#39;oops&#39;)&quot;&gt;.jpg</a>
+            <input type="checkbox" name="my&lt;div&gt;file-clear" id="my&lt;div&gt;file-clear_id" />
+            <label for="my&lt;div&gt;file-clear_id">Clear</label><br />
+            Change: <input type="file" name="my&lt;div&gt;file" />
+            """
+        ))
 
     def test_clear_input_renders_only_if_not_required(self):
         """