From 2a01eea964a055de210005f6ccc76ae27766007d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 13:49:14 +0200
Subject: [PATCH] Return chainable facade instance

---
 packages/framework/tests/Unit/Facades/RouteFacadeTest.php | 7 ++-----
 packages/testing/src/UnitTestCase.php                     | 7 ++++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index ed9b1b6b573..246a9e1babb 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -10,7 +10,6 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 
@@ -60,16 +59,14 @@ public function testCurrentReturnsCurrentRoute()
     {
         $route = new Route(new MarkdownPage('foo'));
 
-        self::mockRender();
-        Render::shouldReceive('getRoute')->andReturn($route);
+        self::mockRender()->shouldReceive('getRoute')->andReturn($route);
 
         $this->assertSame($route, Routes::current());
     }
 
     public function testCurrentReturnsNullIfRouteIsNotFound()
     {
-        self::mockRender();
-        Render::shouldReceive('getRoute')->andReturn(null);
+        self::mockRender()->shouldReceive('getRoute')->andReturn(null);
 
         $this->assertNull(Routes::current());
     }
diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index ecd715787c9..764334bec74 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -52,15 +52,16 @@ protected static function resetKernel(): void
         HydeKernel::setInstance(new HydeKernel());
     }
 
-    protected static function mockRender(): void
+    protected static function mockRender(): Render
     {
         Render::swap(new RenderData());
+
+        return new Render();
     }
 
     protected static function mockCurrentRouteKey(?string $routeKey = null): void
     {
-        Render::swap(new RenderData());
-        Render::shouldReceive('getRouteKey')->andReturn($routeKey);
+        self::mockRender()->shouldReceive('getRouteKey')->andReturn($routeKey);
     }
 
     protected static function mockConfig(array $items = []): void