Merge pull request #532 from livewire/cp/testing-updates

Testing core updates

src/Component.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\ViewErrorBag;
 use Illuminate\Support\Traits\Macroable;
+use Livewire\Livewire;
 
 abstract class Component
 {
@@ -102,6 +103,8 @@ public function output($errors = null)
 
         $output = $view->render();
 
+        Livewire::dispatch('view:render', $view);
+
         $engine->endLivewireRendering();
 
         return $output;

src/Connection/ConnectionHandler.php

@@ -21,7 +21,7 @@ public function handle($payload)
                 $this->processMessage($action['type'], $action['payload'], $instance);
             }
         } catch (ValidationException $e) {
-            $this->interceptValidator($e->validator);
+            Livewire::dispatch('failed-validation', $e->validator);
 
             $errors = $e->validator->errors();
         }

src/HydrationMiddleware/InterceptRedirects.php

@@ -13,7 +13,13 @@ public static function hydrate($unHydratedInstance, $request)
         static::$redirectorCache = app('redirect');
 
         app()->bind('redirect', function () use ($unHydratedInstance) {
-            return app(Redirector::class)->component($unHydratedInstance);
+            $redirector = app(Redirector::class)->component($unHydratedInstance);
+
+            if (app('session.store')) {
+                $redirector->setSession(app('session.store'));
+            }
+
+            return $redirector;;
         });
     }
 

src/LivewireManager.php

@@ -20,6 +20,7 @@ class LivewireManager
     protected $hydrationMiddleware = [];
     protected $initialHydrationMiddleware = [];
     protected $initialDehydrationMiddleware = [];
+    protected $listeners = [];
 
     public static $isLivewireRequestTestingOverride;
 
@@ -123,6 +124,8 @@ public function mount($name, ...$options)
             'initial-data' => array_diff_key($response->toArray(), array_flip(['dom'])),
         ]);
 
+        $this->dispatch('mounted', $response);
+
         return $response;
     }
 
@@ -362,4 +365,18 @@ public function getRootElementTagName($dom)
 
         return $matches[1][0];
     }
+
+    public function dispatch($event, ...$params)
+    {
+        foreach ($this->listeners[$event] ?? [] as $listener) {
+            $listener(...$params);
+        }
+    }
+
+    public function listen($event, $callback)
+    {
+        $this->listeners[$event] ?? $this->listeners[$event] = [];
+
+        $this->listeners[$event][] = $callback;
+    }
 }

src/LivewireServiceProvider.php

@@ -14,7 +14,6 @@
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
-use Illuminate\Foundation\Testing\TestCase;
 use Illuminate\Foundation\Testing\TestResponse;
 use Livewire\Commands\{
     ComponentParser,

src/Testing/Concerns/MakesAssertions.php

@@ -3,6 +3,7 @@
 namespace Livewire\Testing\Concerns;
 
 use Illuminate\Support\MessageBag;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\Assert as PHPUnit;
 
 trait MakesAssertions
@@ -139,54 +140,6 @@ public function assertHasNoErrors($keys = [])
         return $this;
     }
 
-    public function assertStatus($status)
-    {
-        $actual = $this->lastHttpException->getStatusCode();
-
-        PHPUnit::assertTrue(
-            $actual === $status,
-            "Expected status code [{$status}] but received [{$actual}]."
-        );
-
-        return $this;
-    }
-
-    public function assertNotFound()
-    {
-        $actual = $this->lastHttpException->getStatusCode();
-
-        PHPUnit::assertTrue(
-            $actual === 404,
-            'Response status code ['.$actual.'] is not a not found status code.'
-        );
-
-        return $this;
-    }
-
-    public function assertForbidden()
-    {
-        $actual = $this->lastHttpException->getStatusCode();
-
-        PHPUnit::assertTrue(
-            $actual === 403,
-            'Response status code ['.$actual.'] is not a forbidden status code.'
-        );
-
-        return $this;
-    }
-
-    public function assertUnauthorized()
-    {
-        $actual = $this->lastHttpException->getStatusCode();
-
-        PHPUnit::assertTrue(
-            $actual === 401,
-            'Response status code ['.$actual.'] is not an unauthorized status code.'
-        );
-
-        return $this;
-    }
-
     public function assertRedirect($uri = null)
     {
         PHPUnit::assertIsString(
@@ -200,4 +153,19 @@ public function assertRedirect($uri = null)
 
         return $this;
     }
+
+    public function assertViewHas($key, $value = null)
+    {
+        if (is_null($value)) {
+            PHPUnit::assertArrayHasKey($key, $this->lastRenderedView->gatherData());
+        } elseif ($value instanceof \Closure) {
+            PHPUnit::assertTrue($value($this->lastRenderedView->gatherData()[$key]));
+        } elseif ($value instanceof Model) {
+            PHPUnit::assertTrue($value->is($this->lastRenderedView->gatherData()[$key]));
+        } else {
+            PHPUnit::assertEquals($value, $this->lastRenderedView->gatherData()[$key]);
+        }
+
+        return $this;
+    }
 }

src/Testing/Concerns/MakesCallsToComponent.php

@@ -2,11 +2,13 @@
 
 namespace Livewire\Testing\Concerns;
 
-use Livewire\Testing\TestConnectionHandler;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-
 trait MakesCallsToComponent
 {
+    public function emit($event, ...$parameters)
+    {
+        return $this->fireEvent($event, $parameters);
+    }
+
     public function fireEvent($event, ...$parameters)
     {
         $this->sendMessage('fireEvent', [
@@ -61,26 +63,10 @@ public function updateProperty($name, $value = null)
 
     public function sendMessage($message, $payload)
     {
-        try {
-            $handler = (new TestConnectionHandler);
-
-            $result = $handler->handle([
-                'id' => $this->payload['id'],
-                'name' => $this->payload['name'],
-                'data' => $this->payload['data'],
-                'children' => $this->payload['children'],
-                'checksum' => $this->payload['checksum'],
-                'errorBag' => $this->payload['errorBag'],
-                'actionQueue' => [['type' => $message, 'payload' => $payload]],
-            ]);
-
-            if ($validator = $handler->lastValidator) {
-                $this->lastValidator = $validator;
-            }
+        $this->lastResponse = $this->pretendWereSendingAComponentUpdateRequest($message, $payload);
 
-            $this->updateComponent($result);
-        } catch (HttpException $exception) {
-            $this->lastHttpException = $exception;
+        if (! $this->lastResponse->exception) {
+            $this->updateComponent($this->lastResponse->original);
         }
     }
 }

src/Testing/MakesHttpRequestsWrapper.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Livewire\Testing;
+
+use Exception;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithExceptionHandling;
+use Illuminate\Foundation\Testing\Concerns\MakesHttpRequests;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class MakesHttpRequestsWrapper
+{
+    use MakesHttpRequests, InteractsWithExceptionHandling;
+
+    public function __construct($app)
+    {
+        $this->app = $app;
+    }
+
+    public function temporarilyDisableExceptionHandlingAndMiddleware($callback)
+    {
+        $cachedHandler = app(ExceptionHandler::class);
+        $cachedShouldSkipMiddleware = $this->app->shouldSkipMiddleware();
+
+        $this->withoutExceptionHandling([HttpException::class, AuthorizationException::class])->withoutMiddleware();
+
+        $callback($this);
+
+        $this->app->instance(ExceptionHandler::class, $cachedHandler);
+        if (! $cachedShouldSkipMiddleware) {
+            unset($this->app['middleware.disable']);
+        }
+    }
+
+    public function withoutHandling($except = [])
+    {
+        return $this->withoutExceptionHandling($except);
+    }
+}