Testing

2 files changed, 28 insertions, 44 deletions

diff --git a/tests/app/Http/Controllers/Admin/ModuleControllerTest.php b/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
index 36d6730b34..eff2b9ba90 100644
--- a/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ModuleControllerTest.php
@@ -166,6 +166,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdate(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'update');
 
@@ -177,6 +178,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateAnalytics(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateAnalytics');
 
@@ -188,6 +190,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateBlocks(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateBlocks');
 
@@ -199,6 +202,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateCharts(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateCharts');
 
@@ -210,6 +214,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateFooters(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateFooters');
 
@@ -221,6 +226,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateHistory(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateHistory');
 
@@ -232,6 +238,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateLanguages(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateLanguages');
 
@@ -243,6 +250,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateMenus(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateMenus');
 
@@ -254,6 +262,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateReports(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateReports');
 
@@ -265,6 +274,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateSidebars(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateSidebars');
 
@@ -276,6 +286,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateTabs(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateTabs');
 
@@ -287,6 +298,7 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUpdateThemes(): void
     {
+        Tree::create('name', 'title');
         $controller = app()->make(ModuleController::class);
         $response   = app()->dispatch($controller, 'updateThemes');
 
diff --git a/tests/app/Http/Controllers/ModuleControllerTest.php b/tests/app/Http/Controllers/ModuleControllerTest.php
index 99586175cb..fda81b6dbe 100644
--- a/tests/app/Http/Controllers/ModuleControllerTest.php
+++ b/tests/app/Http/Controllers/ModuleControllerTest.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\Controllers;
 
 use Fisharebest\Webtrees\Auth;
-use Fisharebest\Webtrees\Application;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Tree;
 use Symfony\Component\HttpFoundation\Request;
@@ -40,11 +39,9 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMissingModule(): void
     {
-        app()->instance(Tree::class, Tree::create('name', 'title'));
-        app()->instance(Request::class, new Request(['route' => 'module']));
-
-        $controller = app()->make(ModuleController::class);
-        app()->dispatch($controller, 'action');
+        $request    = new Request(['route' => 'module']);
+        $controller = new ModuleController(new ModuleService());
+        $controller->action($request, Auth::user());
     }
 
     /**
@@ -53,14 +50,9 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testInvalidModule(): void
     {
-        $tree = Tree::create('name', 'title');
-        app()->instance(Tree::class, $tree);
-
         $request    = new Request(['route' => 'module', 'module' => 'no-such-module']);
-        app()->instance(Request::class, $request);
-
-        $controller = app()->make(ModuleController::class);
-        app()->dispatch($controller, 'action');
+        $controller = new ModuleController(new ModuleService());
+        $controller->action($request, Auth::user());
     }
 
     /**
@@ -69,14 +61,9 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMissingAction(): void
     {
-        $tree = Tree::create('name', 'title');
-        app()->instance(Tree::class, $tree);
-
-        $request    = new Request(['route' => 'module', 'module' => 'sitemap']);
-        app()->instance(Request::class, $request);
-
-        $controller = app()->make(ModuleController::class);
-        app()->dispatch($controller, 'action');
+        $request = new Request(['route' => 'module', 'module' => 'sitemap']);
+        $controller = new ModuleController(new ModuleService());
+        $controller->action($request, Auth::user());
     }
 
     /**
@@ -85,14 +72,9 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testInvalidAction(): void
     {
-        $tree = Tree::create('name', 'title');
-        app()->instance(Tree::class, $tree);
-
-        $request    = new Request(['route' => 'module', 'module' => 'sitemap', 'action' => 'no-such-action']);
-        app()->instance(Request::class, $request);
-
-        $controller = app()->make(ModuleController::class);
-        app()->dispatch($controller, 'action');
+        $request = new Request(['route' => 'module', 'module' => 'sitemap', 'action' => 'no-such-action']);
+        $controller = new ModuleController(new ModuleService());
+        $controller->action($request, Auth::user());
     }
 
     /**
@@ -101,14 +83,9 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testVisitorCannotUseAdminAction(): void
     {
-        $tree = Tree::create('name', 'title');
-        app()->instance(Tree::class, $tree);
-
         $request = new Request(['route' => 'module', 'module' => 'sitemap', 'action' => 'DoAdminStuff']);
-        app()->instance(Request::class, $request);
-
-        $controller = app()->make(ModuleController::class);
-        app()->dispatch($controller, 'action');
+        $controller = new ModuleController(new ModuleService());
+        $controller->action($request, Auth::user());
     }
 
     /**
@@ -116,15 +93,10 @@ class ModuleControllerTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSucessfulAction(): void
     {
-        $tree = Tree::create('name', 'title');
-        app()->instance(Tree::class, $tree);
-
         $request = new Request(['route' => 'module', 'module' => 'sitemap', 'action' => 'Index']);
-        app()->instance(Request::class, $request);
-
-        $controller = app()->make(ModuleController::class);
-        $response = app()->dispatch($controller, 'action');
+        $controller = new ModuleController(new ModuleService());
+        $response = $controller->action($request, Auth::user());
 
-        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
     }
 }