From b25433a225d85c6dace5d5e97f4553c01f035fb1 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Fri, 30 Mar 2018 11:55:33 +0200
Subject: [1.11.x] Fixed #29273 -- Prevented initial selection of empty choice
 in multiple choice widgets.

Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01.

Backport of f3b69f9757ec03057441ebbd52b7cdbfed31fb32 from master.
---
 tests/forms_tests/widget_tests/test_selectmultiple.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/forms_tests/widget_tests/test_selectmultiple.py')

diff --git a/tests/forms_tests/widget_tests/test_selectmultiple.py b/tests/forms_tests/widget_tests/test_selectmultiple.py
index 149fae6d4b..3897e36888 100644
--- a/tests/forms_tests/widget_tests/test_selectmultiple.py
+++ b/tests/forms_tests/widget_tests/test_selectmultiple.py
@@ -9,7 +9,7 @@ class SelectMultipleTest(WidgetTest):
 
     def test_format_value(self):
         widget = self.widget(choices=self.numeric_choices)
-        self.assertEqual(widget.format_value(None), [''])
+        self.assertEqual(widget.format_value(None), [])
         self.assertEqual(widget.format_value(''), [''])
         self.assertEqual(widget.format_value([3, 0, 1]), ['3', '0', '1'])
 
@@ -35,10 +35,12 @@ class SelectMultipleTest(WidgetTest):
 
     def test_render_none(self):
         """
-        If the value is None, none of the options are selected.
+        If the value is None, none of the options are selected, even if the
+        choices have an empty option.
         """
-        self.check_html(self.widget(choices=self.beatles), 'beatles', None, html=(
-            """<select multiple="multiple" name="beatles">
+        self.check_html(self.widget(choices=(('', 'Unknown'),) + self.beatles), 'beatles', None, html=(
+            """<select multiple name="beatles">
+            <option value="">Unknown</option>
             <option value="J">John</option>
             <option value="P">Paul</option>
             <option value="G">George</option>
-- 
cgit v1.3