diff options
Diffstat (limited to 'tests/app/Http/RequestHandlers')
13 files changed, 80 insertions, 81 deletions
diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php index cbb8235dba..e257cd9dfa 100644 --- a/tests/app/Http/RequestHandlers/AccountDeleteTest.php +++ b/tests/app/Http/RequestHandlers/AccountDeleteTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -36,11 +36,11 @@ class AccountDeleteTest extends TestCase */ public function testHandler(): void { - $user_service = $this->createMock(UserService::class); + $user_service = self::createMock(UserService::class); $handler = new AccountDelete($user_service); $request = self::createRequest(); $response = $handler->handle($request); - $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode()); + self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode()); } } diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php index 08e0bcea28..57a6d43a9c 100644 --- a/tests/app/Http/RequestHandlers/AccountEditTest.php +++ b/tests/app/Http/RequestHandlers/AccountEditTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -42,12 +42,12 @@ class AccountEditTest extends TestCase */ public function testHandler(): void { - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $handler = new AccountEdit(new MessageService(new EmailService(), new UserService()), new ModuleService()); $request = self::createRequest() ->withAttribute('user', $user); $response = $handler->handle($request); - $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); + self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); } } diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php index cabc74e000..560d7ad9df 100644 --- a/tests/app/Http/RequestHandlers/AccountUpdateTest.php +++ b/tests/app/Http/RequestHandlers/AccountUpdateTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -38,20 +38,20 @@ class AccountUpdateTest extends TestCase */ public function testHandler(): void { - $user_service = $this->createMock(UserService::class); + $user_service = self::createMock(UserService::class); - $user = $this->createMock(User::class); - $user->expects($this->once())->method('setEmail')->with('b'); - $user->expects($this->once())->method('setPassword')->with('e'); - $user->expects($this->once())->method('setRealName')->with('d'); - $user->expects($this->once())->method('setUserName')->with('h'); - $user->expects($this->at(6))->method('setPreference')->with(User::PREF_CONTACT_METHOD, 'a'); - $user->expects($this->at(7))->method('setPreference')->with(User::PREF_LANGUAGE, 'c'); - $user->expects($this->at(8))->method('setPreference')->with(User::PREF_TIME_ZONE, 'g'); - $user->expects($this->at(9))->method('setPreference')->with(User::PREF_IS_VISIBLE_ONLINE, 'i'); + $user = self::createMock(User::class); + $user->expects(self::once())->method('setEmail')->with('b'); + $user->expects(self::once())->method('setPassword')->with('e'); + $user->expects(self::once())->method('setRealName')->with('d'); + $user->expects(self::once())->method('setUserName')->with('h'); + $user->expects(self::at(6))->method('setPreference')->with(User::PREF_CONTACT_METHOD, 'a'); + $user->expects(self::at(7))->method('setPreference')->with(User::PREF_LANGUAGE, 'c'); + $user->expects(self::at(8))->method('setPreference')->with(User::PREF_TIME_ZONE, 'g'); + $user->expects(self::at(9))->method('setPreference')->with(User::PREF_IS_VISIBLE_ONLINE, 'i'); - $tree = $this->createMock(Tree::class); - $tree->expects($this->once())->method('setUserPreference')->with($user, User::PREF_TREE_DEFAULT_XREF, 'f'); + $tree = self::createMock(Tree::class); + $tree->expects(self::once())->method('setUserPreference')->with($user, User::PREF_TREE_DEFAULT_XREF, 'f'); $handler = new AccountUpdate($user_service); $request = self::createRequest() @@ -70,6 +70,6 @@ class AccountUpdateTest extends TestCase ]); $response = $handler->handle($request); - $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode()); + self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode()); } } diff --git a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php index b9951cf2a0..f98be0f4c0 100644 --- a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php +++ b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -57,6 +57,6 @@ class ControlPanelControllerTest extends TestCase $request = self::createRequest(); $response = $handler->handle($request); - $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); + self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); } } diff --git a/tests/app/Http/RequestHandlers/DeleteUserTest.php b/tests/app/Http/RequestHandlers/DeleteUserTest.php index 68491899ed..efaeb420d0 100644 --- a/tests/app/Http/RequestHandlers/DeleteUserTest.php +++ b/tests/app/Http/RequestHandlers/DeleteUserTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -38,11 +38,11 @@ class DeleteUserTest extends TestCase */ public function testDeleteUser(): void { - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $user->method('id')->willReturn(1); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn($user); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() ->withAttribute('user_id', $user->id()); @@ -60,8 +60,8 @@ class DeleteUserTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('User ID 98765 not found'); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn(null); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn(null); $request = self::createRequest() ->withAttribute('user_id', 98765); @@ -77,12 +77,12 @@ class DeleteUserTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('Cannot delete an administrator'); - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $user->method('id')->willReturn(1); - $user->expects($this->once())->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('1'); + $user->expects(self::once())->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('1'); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn($user); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() ->withAttribute('user_id', $user->id()); diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php index 670b03f187..4f967cf12f 100644 --- a/tests/app/Http/RequestHandlers/LoginPageTest.php +++ b/tests/app/Http/RequestHandlers/LoginPageTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -48,7 +48,7 @@ class LoginPageTest extends TestCase public function testLoginPageAlreadyLoggedIn(): void { $tree_service = new TreeService(); - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $request = self::createRequest()->withAttribute('user', $user); $handler = new LoginPage($tree_service); $response = $handler->handle($request); diff --git a/tests/app/Http/RequestHandlers/MasqueradeTest.php b/tests/app/Http/RequestHandlers/MasqueradeTest.php index 58e369300d..29edb9f263 100644 --- a/tests/app/Http/RequestHandlers/MasqueradeTest.php +++ b/tests/app/Http/RequestHandlers/MasqueradeTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -37,14 +37,14 @@ class MasqueradeTest extends TestCase */ public function testMasqueradeAsUser(): void { - $user1 = $this->createMock(User::class); + $user1 = self::createMock(User::class); $user1->method('id')->willReturn(1); - $user2 = $this->createMock(User::class); + $user2 = self::createMock(User::class); $user2->method('id')->willReturn(2); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn($user2); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn($user2); $request = self::createRequest() ->withAttribute('user', $user1) @@ -63,11 +63,11 @@ class MasqueradeTest extends TestCase */ public function testCannotMasqueradeAsSelf(): void { - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $user->method('id')->willReturn(1); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn($user); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() ->withAttribute('user', $user) @@ -88,11 +88,11 @@ class MasqueradeTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('User ID 2 not found'); - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $user->method('id')->willReturn(1); - $user_service = $this->createMock(UserService::class); - $user_service->expects($this->once())->method('find')->willReturn(null); + $user_service = self::createMock(UserService::class); + $user_service->expects(self::once())->method('find')->willReturn(null); $request = self::createRequest() ->withAttribute('user', $user) diff --git a/tests/app/Http/RequestHandlers/ModuleActionTest.php b/tests/app/Http/RequestHandlers/ModuleActionTest.php index 11a1131699..dd92d7322d 100644 --- a/tests/app/Http/RequestHandlers/ModuleActionTest.php +++ b/tests/app/Http/RequestHandlers/ModuleActionTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -28,7 +28,6 @@ use Fisharebest\Webtrees\Module\ModuleInterface; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\TestCase; use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; use function response; @@ -42,9 +41,9 @@ class ModuleActionTest extends TestCase */ public function testModuleAction(): void { - $module_service = $this->createMock(ModuleService::class); + $module_service = self::createMock(ModuleService::class); $module_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByName') ->with('test') ->willReturn($this->fooModule()); @@ -57,8 +56,8 @@ class ModuleActionTest extends TestCase $handler = new ModuleAction($module_service); $response = $handler->handle($request); - $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); - $this->assertSame('It works!', (string) $response->getBody()); + self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); + self::assertSame('It works!', (string) $response->getBody()); } /** @@ -69,9 +68,9 @@ class ModuleActionTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('Method getTestingAction() not found in test'); - $module_service = $this->createMock(ModuleService::class); + $module_service = self::createMock(ModuleService::class); $module_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByName') ->with('test') ->willReturn($this->fooModule()); @@ -93,9 +92,9 @@ class ModuleActionTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('Module test does not exist'); - $module_service = $this->createMock(ModuleService::class); + $module_service = self::createMock(ModuleService::class); $module_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByName') ->with('test') ->willReturn(null); @@ -117,9 +116,9 @@ class ModuleActionTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('Admin only action'); - $module_service = $this->createMock(ModuleService::class); + $module_service = self::createMock(ModuleService::class); $module_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByName') ->with('test') ->willReturn($this->fooModule()); @@ -139,7 +138,7 @@ class ModuleActionTest extends TestCase private function fooModule(): ModuleInterface { return new class extends AbstractModule { - public function getTestAction(ServerRequestInterface $request): ResponseInterface + public function getTestAction(): ResponseInterface { return response('It works!'); } diff --git a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php index 67ad4fc708..57388e29d1 100644 --- a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php +++ b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -45,7 +45,7 @@ class PasswordRequestPageTest extends TestCase */ public function testPasswordRequestPageAlreadyLoggedIn(): void { - $user = $this->createMock(User::class); + $user = self::createMock(User::class); $request = self::createRequest()->withAttribute('user', $user); $handler = new PasswordRequestPage(); $response = $handler->handle($request); diff --git a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php index 3aad986c7e..c61e05dd74 100644 --- a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php +++ b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -35,11 +35,11 @@ class PasswordResetPageTest extends TestCase */ public function testPasswordResetPageWithValidToken(): void { - $user = $this->createMock(User::class); + $user = self::createMock(User::class); - $user_service = $this->createMock(UserService::class); + $user_service = self::createMock(UserService::class); $user_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByToken') ->with('1234') ->willReturn($user); @@ -57,9 +57,9 @@ class PasswordResetPageTest extends TestCase */ public function testPasswordResetPageWithoutValidToken(): void { - $user_service = $this->createMock(UserService::class); + $user_service = self::createMock(UserService::class); $user_service - ->expects($this->once()) + ->expects(self::once()) ->method('findByToken') ->with('4321') ->willReturn(null); diff --git a/tests/app/Http/RequestHandlers/PingTest.php b/tests/app/Http/RequestHandlers/PingTest.php index c27ff1aeb1..b8e24567a8 100644 --- a/tests/app/Http/RequestHandlers/PingTest.php +++ b/tests/app/Http/RequestHandlers/PingTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -34,9 +34,9 @@ class PingTest extends TestCase */ public function testPingOK(): void { - $server_check_service = $this->createMock(ServerCheckService::class); - $server_check_service->expects($this->once())->method('serverErrors')->willReturn(new Collection()); - $server_check_service->expects($this->once())->method('serverWarnings')->willReturn(new Collection()); + $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection()); + $server_check_service->expects(self::once())->method('serverWarnings')->willReturn(new Collection()); $request = self::createRequest(); $handler = new Ping($server_check_service); @@ -51,9 +51,9 @@ class PingTest extends TestCase */ public function testPingWarnings(): void { - $server_check_service = $this->createMock(ServerCheckService::class); - $server_check_service->expects($this->once())->method('serverErrors')->willReturn(new Collection()); - $server_check_service->expects($this->once())->method('serverWarnings')->willReturn(new Collection('warning')); + $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection()); + $server_check_service->expects(self::once())->method('serverWarnings')->willReturn(new Collection('warning')); $request = self::createRequest(); $handler = new Ping($server_check_service); @@ -68,8 +68,8 @@ class PingTest extends TestCase */ public function testPingErrors(): void { - $server_check_service = $this->createMock(ServerCheckService::class); - $server_check_service->expects($this->once())->method('serverErrors')->willReturn(new Collection('error')); + $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection('error')); $request = self::createRequest(); $handler = new Ping($server_check_service); diff --git a/tests/app/Http/RequestHandlers/SelectLanguageTest.php b/tests/app/Http/RequestHandlers/SelectLanguageTest.php index 6102c2b5ca..d57d93537e 100644 --- a/tests/app/Http/RequestHandlers/SelectLanguageTest.php +++ b/tests/app/Http/RequestHandlers/SelectLanguageTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/tests/app/Http/RequestHandlers/SelectThemeTest.php b/tests/app/Http/RequestHandlers/SelectThemeTest.php index c4d4765f68..4ebad412e1 100644 --- a/tests/app/Http/RequestHandlers/SelectThemeTest.php +++ b/tests/app/Http/RequestHandlers/SelectThemeTest.php @@ -2,7 +2,7 @@ /** * webtrees: online genealogy - * Copyright (C) 2019 webtrees development team + * Copyright (C) 2020 webtrees development team * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -34,8 +34,8 @@ class SelectThemeTest extends TestCase */ public function testSelectThemeForGuest(): void { - $user = $this->createMock(GuestUser::class); - $user->expects($this->once())->method('setPreference')->with('theme', 'FOO'); + $user = self::createMock(GuestUser::class); + $user->expects(self::once())->method('setPreference')->with('theme', 'FOO'); $request = self::createRequest() ->withAttribute('theme', 'FOO') @@ -52,8 +52,8 @@ class SelectThemeTest extends TestCase */ public function testSelectThemeForUser(): void { - $user = $this->createMock(User::class); - $user->expects($this->once())->method('setPreference')->with('theme', 'FOO'); + $user = self::createMock(User::class); + $user->expects(self::once())->method('setPreference')->with('theme', 'FOO'); $request = self::createRequest() ->withAttribute('user', $user) |