add/refactor tests

Author: kbond

src/LiveComponent/tests/Fixture/Component/ComponentWithAttributes.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\UX\LiveComponent\Tests\Fixture\Component;
+
+use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\DefaultActionTrait;
+use Symfony\UX\TwigComponent\HasAttributesTrait;
+
+/**
+ * @author Kevin Bond <[email protected]>
+ */
+#[AsLiveComponent('with_attributes')]
+final class ComponentWithAttributes
+{
+    use DefaultActionTrait;
+    use HasAttributesTrait;
+}

src/LiveComponent/tests/Fixture/Kernel.php

@@ -27,6 +27,7 @@
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component2;
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component3;
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component6;
+use Symfony\UX\LiveComponent\Tests\Fixture\Component\ComponentWithAttributes;
 use Symfony\UX\TwigComponent\TwigComponentBundle;
 use Twig\Environment;
 
@@ -67,13 +68,15 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
         $componentB = $c->register(Component2::class)->setAutoconfigured(true)->setAutowired(true);
         $componentC = $c->register(Component3::class)->setAutoconfigured(true)->setAutowired(true);
         $componentF = $c->register(Component6::class)->setAutoconfigured(true)->setAutowired(true);
+        $withAttributes = $c->register(ComponentWithAttributes::class)->setAutoconfigured(true)->setAutowired(true);
 
         if (self::VERSION_ID < 50300) {
             // add tag manually
             $componentA->addTag('twig.component', ['key' => 'component1', 'live' => true])->addTag('controller.service_arguments');
             $componentB->addTag('twig.component', ['key' => 'component2', 'live' => true, 'default_action' => 'defaultAction'])->addTag('controller.service_arguments');
             $componentC->addTag('twig.component', ['key' => 'component3', 'live' => true])->addTag('controller.service_arguments');
             $componentF->addTag('twig.component', ['key' => 'component6', 'live' => true])->addTag('controller.service_arguments');
+            $componentF->addTag('twig.component', ['key' => 'with_attributes', 'live' => true])->addTag('controller.service_arguments');
         }
 
         $sessionConfig = self::VERSION_ID < 50300 ? ['storage_id' => 'session.storage.mock_file'] : ['storage_factory_id' => 'session.storage.factory.mock_file'];

src/LiveComponent/tests/Fixture/templates/components/component1.html.twig

@@ -1,6 +1,4 @@
-<div
-    {{ init_live_component() }}
->
+<div{{ attributes }}>
     Prop1: {{ this.prop1.id }}
     Prop2: {{ this.prop2|date('Y-m-d g:i') }}
     Prop3: {{ this.prop3 }}

src/LiveComponent/tests/Fixture/templates/components/component6.html.twig

@@ -1,6 +1,4 @@
-<div
-    {{ init_live_component(this) }}
->
+<div{{ attributes }}>
     Arg1: {{ this.called ? this.arg1 : 'not provided' }}
     Arg2: {{ this.called ? this.arg2 : 'not provided' }}
     Arg3: {{ this.called ? this.arg3 : 'not provided' }}

src/LiveComponent/tests/Functional/Twig/LiveComponentExtensionTest.php renamed to src/LiveComponent/tests/Functional/EventListener/AddLiveAttributesSubscriberTest.php

@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Functional\Twig;
+namespace Symfony\UX\LiveComponent\Tests\Functional\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Browser\Test\HasBrowser;
 
 /**
  * @author Kevin Bond <[email protected]>
  */
-final class LiveComponentExtensionTest extends KernelTestCase
+final class AddLiveAttributesSubscriberTest extends KernelTestCase
 {
     use HasBrowser;
 

src/LiveComponent/tests/Integration/LiveComponentHydratorTest.php

@@ -18,10 +18,9 @@
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component1;
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component2;
 use Symfony\UX\LiveComponent\Tests\Fixture\Component\Component3;
+use Symfony\UX\LiveComponent\Tests\Fixture\Component\ComponentWithAttributes;
 use Symfony\UX\LiveComponent\Tests\Fixture\Entity\Entity1;
-use Symfony\UX\TwigComponent\ComponentAttributes;
 use Symfony\UX\TwigComponent\ComponentFactory;
-use Symfony\UX\TwigComponent\HasAttributesTrait;
 use function Zenstruck\Foundry\create;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
@@ -273,22 +272,46 @@ public function testCanDehydrateAndHydrateComponentsWithAttributes(): void
         /** @var LiveComponentHydrator $hydrator */
         $hydrator = self::getContainer()->get('ux.live_component.component_hydrator');
 
-        $component = new class() {
-            use HasAttributesTrait;
-        };
-        $instance = clone $component;
-        $instance->attributes = new ComponentAttributes($attributes = ['class' => 'foo']);
+        /** @var ComponentFactory $factory */
+        $factory = self::getContainer()->get('ux.twig_component.component_factory');
 
-        $this->assertSame($attributes, $instance->attributes->all());
+        /** @var ComponentWithAttributes $component */
+        $component = $factory->create('with_attributes', $attributes = ['class' => 'foo']);
 
-        $dehydrated = $hydrator->dehydrate($instance);
+        $this->assertSame($attributes, $component->attributes->all());
+
+        $dehydrated = $hydrator->dehydrate($component);
 
         $this->assertArrayHasKey('attributes', $dehydrated);
         $this->assertSame($attributes, $dehydrated['attributes']);
-        $this->assertFalse(isset($component->prop));
 
-        $hydrator->hydrate($component, $dehydrated);
+        $hydrator->hydrate($component = $factory->get('with_attributes'), $dehydrated);
 
         $this->assertSame($attributes, $component->attributes->all());
     }
+
+    public function testCanDehydrateAndHydrateComponentsWithEmptyAttributes(): void
+    {
+        /** @var LiveComponentHydrator $hydrator */
+        $hydrator = self::getContainer()->get('ux.live_component.component_hydrator');
+
+        /** @var ComponentFactory $factory */
+        $factory = self::getContainer()->get('ux.twig_component.component_factory');
+
+        /** @var ComponentWithAttributes $component */
+        $component = $factory->create('with_attributes');
+
+        $this->assertSame([], $component->attributes->all());
+
+        $dehydrated = $hydrator->dehydrate($component);
+
+        $this->assertArrayHasKey('attributes', $dehydrated);
+        $this->assertSame([], $dehydrated['attributes']);
+
+        $component = $factory->get('with_attributes');
+
+        $hydrator->hydrate($component, $dehydrated);
+
+        $this->assertSame([], $component->attributes->all());
+    }
 }