Fix setValue on checkbox and select fields if they are multiple (#526)

Co-authored-by: Robert Freigang <[email protected]>
symfony · Jan 4, 2022 · 23c920d · 23c920d
1 parent cddbb0b
commit 23c920d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/src/DomCrawler/Field/ChoiceFormField.php b/src/DomCrawler/Field/ChoiceFormField.php
@@ -135,6 +135,9 @@ public function setValue($value): void
             return;
         }
 
+        if ($this->selector->isMultiple()) {
+            $this->selector->deselectAll();
+        }
         foreach ((array) $value as $v) {
             $this->selector->selectByValue($v);
         }

diff --git a/tests/DomCrawler/Field/ChoiceFormFieldTest.php b/tests/DomCrawler/Field/ChoiceFormFieldTest.php
@@ -64,6 +64,21 @@ public function testGetValueFromSelectMultipleIfOneIsSelected(callable $clientFa
         $this->assertSame(['20'], $field->getValue());
     }
 
+    /**
+     * @dataProvider clientFactoryProvider
+     */
+    public function testSetValueFromSelectMultipleIfOneIsSelectedAfterAllHaveBeenSelectedBefore(callable $clientFactory): void
+    {
+        $crawler = $this->request($clientFactory, '/choice-form-field.html');
+        $form = $crawler->filter('form')->form();
+
+        $field = $form['select_multiple_selected_all'];
+        $this->assertInstanceOf(ChoiceFormField::class, $field);
+        $this->assertSame(['10', '20', '30'], $field->getValue());
+        $field->setValue('20');
+        $this->assertSame(['20'], $field->getValue());
+    }
+
     /**
      * @dataProvider clientFactoryProvider
      */
@@ -152,6 +167,26 @@ public function testGetValueFromCheckboxIfMultipleAreChecked(callable $clientFac
         $this->assertSame(['checked_one', 'checked_two'], $field->getValue());
     }
 
+    /**
+     * @dataProvider clientFactoryProvider
+     */
+    public function testSetValueFromCheckboxIfOneIsCheckedAfterAllHaveBeenCheckedBefore(callable $clientFactory, string $type): void
+    {
+        $crawler = $this->request($clientFactory, '/choice-form-field.html');
+        $form = $crawler->filter('form')->form();
+
+        $field = $form['checkbox_multiple_checked'];
+
+        $this->assertInstanceOf(ChoiceFormField::class, $field);
+        // https://github.com/symfony/symfony/issues/26827
+        if (PantherClient::class !== $type) {
+            $this->markTestSkipped('The DomCrawler component doesn\'t support multiple fields with the same name');
+        }
+        $this->assertSame(['checked_one', 'checked_two'], $field->getValue());
+        $field->setValue('checked_two');
+        $this->assertSame('checked_two', $field->getValue());
+    }
+
     /**
      * @dataProvider clientFactoryProvider
      */

diff --git a/tests/fixtures/choice-form-field.html b/tests/fixtures/choice-form-field.html
@@ -41,6 +41,14 @@
         </select>
     </label>
 
+    <label class="field">
+        select_multiple_selected_all
+        <select name="select_multiple_selected_all" multiple="multiple">
+            <option value="10" selected>ten</option>
+            <option value="20" selected>twenty</option>
+            <option value="30" selected>thirty</option>
+        </select>
+    </label>
 
     <label class="field">
         select_multiple_selected_multiple