3 files changed, 1 insertions, 7 deletions
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 84cbcdc6c3..b886570ef1 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -174,7 +174,6 @@ class TestCase extends \PHPUnit\Framework\TestCase
             ->withAttribute('locale', new LocaleEnUs());
 
         app()->instance(ServerRequestInterface::class, $request);
-        View::share('request', $request);
 
         return $request;
     }
@@ -222,8 +221,6 @@ class TestCase extends \PHPUnit\Framework\TestCase
 
         $tree->importGedcomFile($stream, $gedcom_file);
 
-        View::share('tree', $tree);
-
         $timeout_service = new TimeoutService(microtime(true));
         $controller      = new GedcomFileController($timeout_service);
         $request         = self::createRequest()->withAttribute('tree', $tree);
diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php
index 5493c3073f..45cad5e138 100644
--- a/tests/app/Http/RequestHandlers/LoginPageTest.php
+++ b/tests/app/Http/RequestHandlers/LoginPageTest.php
@@ -36,7 +36,6 @@ class LoginPageTest extends TestCase
     public function testLoginPage(): void
     {
         $tree_service = new TreeService();
-        View::share('tree', null);
         $request  = self::createRequest();
         $handler  = new LoginPage($tree_service);
         $response = $handler->handle($request);
diff --git a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
index 9c290aebb3..6c853730d9 100644
--- a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
+++ b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
@@ -41,9 +41,7 @@ class PasswordResetPageTest extends TestCase
         $user_service = $this->createMock(UserService::class);
         $user_service->expects($this->once())->method('findByToken')->willReturn($user);
 
-        View::share('tree', null);
-
-        $request  = self::createRequest();
+        $request  = self::createRequest()->withAttribute('tree', null);
         $handler  = new PasswordResetPage($user_service);
         $response = $handler->handle($request);