complete tests

Author: kbond

src/LiveComponent/src/Controller/BatchActionController.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\LiveComponent\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\UX\TwigComponent\MountedComponent;
@@ -27,7 +28,7 @@ public function __construct(private HttpKernelInterface $kernel)
     {
     }
 
-    public function __invoke(Request $request, MountedComponent $mounted, string $serviceId, array $actions): void
+    public function __invoke(Request $request, MountedComponent $mounted, string $serviceId, array $actions): ?Response
     {
         $request->attributes->set('_mounted_component', $mounted);
 
@@ -41,10 +42,13 @@ public function __invoke(Request $request, MountedComponent $mounted, string $se
                 '_route' => 'live_component',
             ]);
 
-            $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+            $response = $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
 
-            // todo handle redirects
-            // todo handle exceptions
+            if ($response->isRedirection()) {
+                return $response;
+            }
         }
+
+        return null;
     }
 }

src/LiveComponent/src/EventListener/LiveComponentSubscriber.php

@@ -160,10 +160,7 @@ public function onKernelController(ControllerEvent $event): void
             throw new NotFoundHttpException(sprintf('The action "%s" either doesn\'t exist or is not allowed in "%s". Make sure it exist and has the LiveAction attribute above it.', $action, \get_class($component)));
         }
 
-        if ($request->attributes->has('_mounted_component')) {
-            // sub-request
-            $event->setController([$request->attributes->get('_mounted_component')->getComponent(), $action]);
-        } else {
+        if ($event->isMainRequest()) {
             $data = $this->parseDataFor($request);
 
             $request->attributes->set('_component_action_args', $data['args']);
@@ -172,6 +169,9 @@ public function onKernelController(ControllerEvent $event): void
                 $data['data'],
                 $request->attributes->get('_component_name')
             ));
+        } else {
+            // sub-request
+            $event->setController([$request->attributes->get('_mounted_component')->getComponent(), $action]);
         }
 
         $actionArguments = $request->attributes->get('_component_action_args', []);

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

@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Component;
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
@@ -31,4 +32,16 @@ public function add(#[LiveArg] string $what, UrlGeneratorInterface $router): voi
     {
         $this->items[] = $what;
     }
+
+    #[LiveAction]
+    public function redirect(UrlGeneratorInterface $router): RedirectResponse
+    {
+        return new RedirectResponse($router->generate('homepage'));
+    }
+
+    #[LiveAction]
+    public function exception(): void
+    {
+        throw new \RuntimeException('Exception message');
+    }
 }

src/LiveComponent/tests/Functional/Controller/BatchActionControllerTest.php

@@ -68,21 +68,65 @@ public function testCanBatchActions(): void
 
     public function testCsrfTokenIsChecked(): void
     {
-        $this->markTestIncomplete();
-    }
+        $dehydrated = $this->dehydrateComponent($this->mountComponent('with_actions'));
 
-    public function testMustBeLiveComponent(): void
-    {
-        $this->markTestIncomplete();
+        $this->browser()
+            ->post('/_components/with_actions/_batch', ['json' => [
+                'data' => $dehydrated,
+                'actions' => [],
+            ]])
+            ->assertStatus(400)
+        ;
     }
 
     public function testRedirect(): void
     {
-        $this->markTestIncomplete();
+        $dehydrated = $this->dehydrateComponent($this->mountComponent('with_actions'));
+
+        $this->browser()
+            ->throwExceptions()
+            ->get('/_components/with_actions', ['json' => ['data' => $dehydrated]])
+            ->assertSuccessful()
+            ->interceptRedirects()
+            ->use(function (HtmlResponse $response, KernelBrowser $browser) {
+                $browser->post('/_components/with_actions/_batch', [
+                    'json' => [
+                        'data' => json_decode($response->crawler()->filter('ul')->first()->attr('data-live-data-value')),
+                        'actions' => [
+                            ['name' => 'add', 'args' => ['what' => 'second']],
+                            ['name' => 'redirect'],
+                            ['name' => 'add', 'args' => ['what' => 'fourth']],
+                        ],
+                    ],
+                    'headers' => ['X-CSRF-TOKEN' => $response->crawler()->filter('ul')->first()->attr('data-live-csrf-value')],
+                ]);
+            })
+            ->assertRedirectedTo('/')
+        ;
     }
 
     public function testException(): void
     {
-        $this->markTestIncomplete();
+        $dehydrated = $this->dehydrateComponent($this->mountComponent('with_actions'));
+
+        $this->browser()
+            ->get('/_components/with_actions', ['json' => ['data' => $dehydrated]])
+            ->assertSuccessful()
+            ->use(function (HtmlResponse $response, KernelBrowser $browser) {
+                $browser->post('/_components/with_actions/_batch', [
+                    'json' => [
+                        'data' => json_decode($response->crawler()->filter('ul')->first()->attr('data-live-data-value')),
+                        'actions' => [
+                            ['name' => 'add', 'args' => ['what' => 'second']],
+                            ['name' => 'exception'],
+                            ['name' => 'add', 'args' => ['what' => 'fourth']],
+                        ],
+                    ],
+                    'headers' => ['X-CSRF-TOKEN' => $response->crawler()->filter('ul')->first()->attr('data-live-csrf-value')],
+                ]);
+            })
+            ->assertStatus(500)
+            ->assertContains('Exception message')
+        ;
     }
 }