diff options
Diffstat (limited to 'tests/app/Http')
4 files changed, 20 insertions, 17 deletions
diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php index 7fb73b14bf..8b5fa4e7af 100644 --- a/tests/app/Http/RequestHandlers/AccountDeleteTest.php +++ b/tests/app/Http/RequestHandlers/AccountDeleteTest.php @@ -17,10 +17,9 @@ declare(strict_types=1); -namespace Fisharebest\Webtrees\Http\Controllers\Admin; +namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; -use Fisharebest\Webtrees\Http\RequestHandlers\AccountDelete; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; @@ -36,10 +35,12 @@ class AccountDeleteTest extends TestCase */ public function testHandler(): void { - $user_service = $this->createMock(UserService::class); - $handler = new AccountDelete($user_service); - $request = self::createRequest(); - $response = $handler->handle($request); + $user_service = $this->createStub(UserService::class); + + $request = self::createRequest(); + + $handler = new AccountDelete($user_service); + $response = $handler->handle($request); self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode()); } diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php index 1a0e13c078..68dfa4a08e 100644 --- a/tests/app/Http/RequestHandlers/AccountEditTest.php +++ b/tests/app/Http/RequestHandlers/AccountEditTest.php @@ -17,16 +17,14 @@ declare(strict_types=1); -namespace Fisharebest\Webtrees\Http\Controllers\Admin; +namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; -use Fisharebest\Webtrees\Http\RequestHandlers\AccountEdit; -use Fisharebest\Webtrees\Services\EmailService; use Fisharebest\Webtrees\Services\MessageService; use Fisharebest\Webtrees\Services\ModuleService; -use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\User; +use Illuminate\Support\Collection; /** * Test the AccountEdit request handler. @@ -42,10 +40,16 @@ class AccountEditTest extends TestCase */ public function testHandler(): void { - $user = $this->createMock(User::class); - $handler = new AccountEdit(new MessageService(new EmailService(), new UserService()), new ModuleService()); - $request = self::createRequest() + $user = $this->createStub(User::class); + $message_service = $this->createStub(MessageService::class); + $module_service = $this->createStub(ModuleService::class); + + $module_service->method('findByInterface')->willReturn(new Collection([])); + + $request = self::createRequest() ->withAttribute('user', $user); + + $handler = new AccountEdit($message_service, $module_service); $response = $handler->handle($request); self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php index 7d6b3df439..cf277f0a7b 100644 --- a/tests/app/Http/RequestHandlers/AccountUpdateTest.php +++ b/tests/app/Http/RequestHandlers/AccountUpdateTest.php @@ -17,11 +17,10 @@ declare(strict_types=1); -namespace Fisharebest\Webtrees\Http\Controllers\Admin; +namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Http\RequestHandlers\AccountUpdate; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; diff --git a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php index 201adffd80..b4ef19fd97 100644 --- a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php +++ b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php @@ -17,10 +17,9 @@ declare(strict_types=1); -namespace Fisharebest\Webtrees\Http\Controllers\Admin; +namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; -use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Services\AdminService; use Fisharebest\Webtrees\Services\GedcomImportService; use Fisharebest\Webtrees\Services\HousekeepingService; |