After merge cleanup and tests fixing

Author: Lustmored

src/LiveComponent/assets/test/controller/model.test.ts

@@ -201,7 +201,7 @@ describe('LiveController data-model Tests', () => {
     });
 
     it('sends correct data for checkbox fields', async () => {
-        const checkboxTemplate = (data) => `
+        const checkboxTemplate = (data: any) => `
             <div
                 ${initLiveComponent('/_components/my_component', data)}
                 data-action="change->live#update"
@@ -213,29 +213,24 @@ describe('LiveController data-model Tests', () => {
                 <label>
                     Checkbox 2: <input type="checkbox" name="form[check2]" value="1" ${data.form.check2 ? 'checked' : ''} />
                 </label>
+                
+                Checkbox 2 is ${data.form.check2 ? 'checked' : 'unchecked' }
             </div>
         `;
-        const data = { form: { check1: null, check2: null} };
+        const data = { form: { check1: false, check2: false} };
         const { element, controller } = await startStimulus(checkboxTemplate(data));
 
         const check1Element = getByLabelText(element, 'Checkbox 1:');
         const check2Element = getByLabelText(element, 'Checkbox 2:');
 
+        // no mockRerender needed... not sure why. This first Ajax call is likely
+        // interrupted by the next immediately starting
         await userEvent.click(check1Element);
-        await waitFor(() => expect(check1Element).toBeChecked());
 
-        mockRerender({ form: {check1: '1'}}, checkboxTemplate, (data) => {
-            data.form.check1 = '1';
-            data.form.check2 = null;
-        });
+        mockRerender({ form: {check1: '1', check2: '1'}}, checkboxTemplate);
 
         await userEvent.click(check2Element);
-        await waitFor(() => expect(check2Element).toBeChecked());
-
-        mockRerender({ form: {check1: '1', check2: '1'}}, checkboxTemplate, (data) => {
-            data.form.check1 = '1';
-            data.form.check2 = '1';
-        });
+        await waitFor(() => expect(element).toHaveTextContent('Checkbox 2 is checked'));
 
         expect(controller.dataValue).toEqual({form: {check1: '1', check2: '1'}});
 

src/LiveComponent/tests/Fixtures/Component/FormComponent1.php

@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Fixture\Component;
+namespace Symfony\UX\LiveComponent\Tests\Fixtures\Component;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\ComponentWithFormTrait;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
-use Symfony\UX\LiveComponent\Tests\Fixture\Form\FormType1;
+use Symfony\UX\LiveComponent\Tests\Fixtures\Form\FormType1;
 
 /**
  * @author Jakub Caban <[email protected]>

src/LiveComponent/tests/Fixture/Form/FormType1.php renamed to src/LiveComponent/tests/Fixtures/Form/FormType1.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Symfony\UX\LiveComponent\Tests\Fixture\Form;
+namespace Symfony\UX\LiveComponent\Tests\Fixtures\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;

src/LiveComponent/tests/Fixtures/templates/components/form_component1.html.twig

@@ -1,5 +1,5 @@
 <div
-        {{ init_live_component(this) }}
+        {{ attributes }}
 >
     {{ form(this.form) }}
 </div>

src/LiveComponent/tests/Functional/Form/ComponentWithFormTest.php

@@ -17,7 +17,7 @@
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\UX\LiveComponent\LiveComponentHydrator;
-use Symfony\UX\LiveComponent\Tests\Fixture\Component\FormComponent1;
+use Symfony\UX\LiveComponent\Tests\Fixtures\Component\FormComponent1;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Component\FormWithCollectionTypeComponent;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Form\BlogPostFormType;
 use Symfony\UX\TwigComponent\ComponentFactory;
@@ -144,6 +144,7 @@ public function testFormRemembersValidationFromInitialForm(): void
             ->assertContains('The title field should not be blank')
         ;
     }
+
     public function testHandleCheckboxChanges(): void
     {
         /** @var LiveComponentHydrator $hydrator */
@@ -176,7 +177,7 @@ public function testHandleCheckboxChanges(): void
 
         $this->browser()
             ->throwExceptions()
-            ->get('/_components/form_component1?'.http_build_query($dehydrated))
+            ->get('/_components/form_component1?data='.urlencode(json_encode($dehydrated)))
             ->assertSuccessful()
             ->assertContains('<input type="checkbox" id="form_choice_multiple_1" name="form[choice_multiple][]" value="2" checked="checked" />')
             ->assertContains('<input type="checkbox" id="form_choice_multiple_0" name="form[choice_multiple][]" value="1" />')
@@ -194,7 +195,7 @@ public function testHandleCheckboxChanges(): void
 
                 $dehydrated['form'] = $bareForm;
             })
-            ->get('/_components/form_component1?'.http_build_query($dehydrated))
+            ->get('/_components/form_component1?data='.urlencode(json_encode($dehydrated)))
             ->assertContains('<input type="checkbox" id="form_choice_multiple_1" name="form[choice_multiple][]" value="2" checked="checked" />')
             ->assertContains('<input type="checkbox" id="form_choice_multiple_0" name="form[choice_multiple][]" value="1" checked="checked" />')
             ->use(function (HtmlResponse $response) use (&$fullBareData, &$dehydrated, &$bareForm) {
@@ -214,7 +215,7 @@ public function testHandleCheckboxChanges(): void
 
                 $dehydrated['form'] = $bareForm;
             })
-            ->get('/_components/form_component1?'.http_build_query($dehydrated))
+            ->get('/_components/form_component1?data='.urlencode(json_encode($dehydrated)))
             ->assertContains('<input type="checkbox" id="form_choice_multiple_1" name="form[choice_multiple][]" value="2" />')
             ->assertContains('<input type="checkbox" id="form_choice_multiple_0" name="form[choice_multiple][]" value="1" />')
             ->assertContains('<input type="checkbox" id="form_checkbox" name="form[checkbox]" required="required" value="1" checked="checked" />')

src/LiveComponent/tests/Unit/Form/ComponentWithFormTest.php

@@ -14,20 +14,18 @@
 namespace Symfony\UX\LiveComponent\Tests\Unit\Form;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\UX\LiveComponent\Tests\ContainerBC;
-use Symfony\UX\LiveComponent\Tests\Fixture\Component\FormComponent1;
+use Symfony\UX\LiveComponent\Tests\Fixtures\Component\FormComponent1;
 
 /**
  * @author Jakub Caban <[email protected]>
  */
 class ComponentWithFormTest extends KernelTestCase
 {
-    use ContainerBC;
-
     public function testFormValues(): void
     {
         $formFactory = self::getContainer()->get('form.factory');
         $component = new FormComponent1($formFactory);
+        $component->postMount([]);
 
         $this->assertSame(
             [
@@ -42,7 +40,7 @@ public function testFormValues(): void
                 'file' => '',
                 'hidden' => '',
             ],
-            $component->getFormValues()
+            $component->formValues
         );
     }
 }