summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/app/Http/Controllers/Admin/UsersControllerTest.php4
-rw-r--r--tests/app/Http/Middleware/AuthAdministratorTest.php4
-rw-r--r--tests/app/Http/Middleware/AuthEditorTest.php8
-rw-r--r--tests/app/Http/Middleware/AuthManagerTest.php8
-rw-r--r--tests/app/Http/Middleware/AuthMemberTest.php8
-rw-r--r--tests/app/Http/Middleware/AuthModeratorTest.php8
-rw-r--r--tests/app/Http/RequestHandlers/AccountDeleteTest.php46
-rw-r--r--tests/app/Http/RequestHandlers/AccountEditTest.php49
-rw-r--r--tests/app/Http/RequestHandlers/AccountUpdateTest.php75
-rw-r--r--tests/app/Http/RequestHandlers/DeleteUserTest.php2
-rw-r--r--tests/app/Module/AhnentafelReportModuleTest.php3
-rw-r--r--tests/app/Module/BirthReportModuleTest.php3
-rw-r--r--tests/app/Module/CemeteryReportModuleTest.php3
-rw-r--r--tests/app/Module/ChangeReportModuleTest.php3
-rw-r--r--tests/app/Module/DeathReportModuleTest.php3
-rw-r--r--tests/app/Module/DescendancyReportModuleTest.php3
-rw-r--r--tests/app/Module/FactSourcesReportModuleTest.php3
-rw-r--r--tests/app/Module/FamilyGroupReportModuleTest.php3
-rw-r--r--tests/app/Module/IndividualFamiliesReportModuleTest.php3
-rw-r--r--tests/app/Module/IndividualReportModuleTest.php3
-rw-r--r--tests/app/Module/MarriageReportModuleTest.php3
-rw-r--r--tests/app/Module/MissingFactsReportModuleTest.php3
-rw-r--r--tests/app/Module/OccupationReportModuleTest.php3
-rw-r--r--tests/app/Module/PedigreeReportModuleTest.php3
-rw-r--r--tests/app/Module/RelatedIndividualsReportModuleTest.php3
-rw-r--r--tests/app/Services/UserServiceTest.php45
-rw-r--r--tests/app/TreeTest.php36
-rw-r--r--tests/feature/EmbeddedVariablesTest.php4
28 files changed, 264 insertions, 78 deletions
diff --git a/tests/app/Http/Controllers/Admin/UsersControllerTest.php b/tests/app/Http/Controllers/Admin/UsersControllerTest.php
index 89cdba8a73..7f4cfa65fe 100644
--- a/tests/app/Http/Controllers/Admin/UsersControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/UsersControllerTest.php
@@ -152,10 +152,10 @@ class UsersControllerTest extends TestCase
'language' => '',
'timezone' => '',
'comment' => '',
- 'contact_method' => '',
+ 'contact-method' => '',
'auto_accept' => '',
'canadmin' => '',
- 'visible_online' => '',
+ 'visible-online' => '',
'verified' => '',
'approved' => '',
])
diff --git a/tests/app/Http/Middleware/AuthAdministratorTest.php b/tests/app/Http/Middleware/AuthAdministratorTest.php
index e26a15fe79..4109b251b9 100644
--- a/tests/app/Http/Middleware/AuthAdministratorTest.php
+++ b/tests/app/Http/Middleware/AuthAdministratorTest.php
@@ -44,7 +44,7 @@ class AuthAdministratorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('1');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('1');
$request = self::createRequest()->withAttribute('user', $user);
$middleware = new AuthAdministrator();
@@ -66,7 +66,7 @@ class AuthAdministratorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$request = self::createRequest()->withAttribute('user', $user);
$middleware = new AuthAdministrator();
diff --git a/tests/app/Http/Middleware/AuthEditorTest.php b/tests/app/Http/Middleware/AuthEditorTest.php
index 6da8ff31d8..d590dce1a5 100644
--- a/tests/app/Http/Middleware/AuthEditorTest.php
+++ b/tests/app/Http/Middleware/AuthEditorTest.php
@@ -45,10 +45,10 @@ class AuthEditorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('edit');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn('edit');
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthEditor();
@@ -70,10 +70,10 @@ class AuthEditorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('access');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn('access');
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthEditor();
diff --git a/tests/app/Http/Middleware/AuthManagerTest.php b/tests/app/Http/Middleware/AuthManagerTest.php
index 29db06b27c..9632e9c794 100644
--- a/tests/app/Http/Middleware/AuthManagerTest.php
+++ b/tests/app/Http/Middleware/AuthManagerTest.php
@@ -45,10 +45,10 @@ class AuthManagerTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('admin');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn(User::ROLE_MANAGER);
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthManager();
@@ -70,10 +70,10 @@ class AuthManagerTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('accept');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn(User::ROLE_MODERATOR);
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthManager();
diff --git a/tests/app/Http/Middleware/AuthMemberTest.php b/tests/app/Http/Middleware/AuthMemberTest.php
index c655740748..3f52103cbe 100644
--- a/tests/app/Http/Middleware/AuthMemberTest.php
+++ b/tests/app/Http/Middleware/AuthMemberTest.php
@@ -45,10 +45,10 @@ class AuthMemberTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('access');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn('access');
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthMember();
@@ -70,10 +70,10 @@ class AuthMemberTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn('');
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthMember();
diff --git a/tests/app/Http/Middleware/AuthModeratorTest.php b/tests/app/Http/Middleware/AuthModeratorTest.php
index c555451657..bfa41ed438 100644
--- a/tests/app/Http/Middleware/AuthModeratorTest.php
+++ b/tests/app/Http/Middleware/AuthModeratorTest.php
@@ -45,10 +45,10 @@ class AuthModeratorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('accept');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn(User::ROLE_MODERATOR);
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthModerator();
@@ -70,10 +70,10 @@ class AuthModeratorTest extends TestCase
$handler->method('handle')->willReturn(response('lorem ipsum'));
$user = $this->createMock(User::class);
- $user->method('getPreference')->with('canadmin')->willReturn('0');
+ $user->method('getPreference')->with(User::PREF_IS_ADMINISTRATOR)->willReturn('');
$tree = $this->createMock(Tree::class);
- $tree->method('getUserPreference')->with($user, 'canedit')->willReturn('edit');
+ $tree->method('getUserPreference')->with($user, User::PREF_TREE_ROLE)->willReturn('edit');
$request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
$middleware = new AuthModerator();
diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php
new file mode 100644
index 0000000000..cbb8235dba
--- /dev/null
+++ b/tests/app/Http/RequestHandlers/AccountDeleteTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2019 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
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Http\Controllers\Admin;
+
+use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Http\RequestHandlers\AccountDelete;
+use Fisharebest\Webtrees\Services\UserService;
+use Fisharebest\Webtrees\TestCase;
+
+/**
+ * Test the AccountDelete request handler.
+ *
+ * @covers \Fisharebest\Webtrees\Http\RequestHandlers\AccountDelete
+ */
+class AccountDeleteTest extends TestCase
+{
+ /**
+ * @return void
+ */
+ public function testHandler(): void
+ {
+ $user_service = $this->createMock(UserService::class);
+ $handler = new AccountDelete($user_service);
+ $request = self::createRequest();
+ $response = $handler->handle($request);
+
+ $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
+ }
+}
diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php
new file mode 100644
index 0000000000..30e05b9d78
--- /dev/null
+++ b/tests/app/Http/RequestHandlers/AccountEditTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2019 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
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Http\Controllers\Admin;
+
+use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Http\RequestHandlers\AccountEdit;
+use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
+
+/**
+ * Test the AccountEdit request handler.
+ *
+ * @covers \Fisharebest\Webtrees\Http\RequestHandlers\AccountEdit
+ */
+class AccountEditTest extends TestCase
+{
+ protected static $uses_database = true;
+
+ /**
+ * @return void
+ */
+ public function testHandler(): void
+ {
+ $user = $this->createMock(User::class);
+ $handler = new AccountEdit();
+ $request = self::createRequest()
+ ->withAttribute('user', $user);
+ $response = $handler->handle($request);
+
+ $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
+ }
+}
diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php
new file mode 100644
index 0000000000..cabc74e000
--- /dev/null
+++ b/tests/app/Http/RequestHandlers/AccountUpdateTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2019 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
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Http\Controllers\Admin;
+
+use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Http\RequestHandlers\AccountUpdate;
+use Fisharebest\Webtrees\Services\UserService;
+use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\Tree;
+use Fisharebest\Webtrees\User;
+
+/**
+ * Test the AccountUpdate request handler.
+ *
+ * @covers \Fisharebest\Webtrees\Http\RequestHandlers\AccountUpdate
+ */
+class AccountUpdateTest extends TestCase
+{
+ /**
+ * @return void
+ */
+ public function testHandler(): void
+ {
+ $user_service = $this->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');
+
+ $tree = $this->createMock(Tree::class);
+ $tree->expects($this->once())->method('setUserPreference')->with($user, User::PREF_TREE_DEFAULT_XREF, 'f');
+
+ $handler = new AccountUpdate($user_service);
+ $request = self::createRequest()
+ ->withAttribute('tree', $tree)
+ ->withAttribute('user', $user)
+ ->withParsedBody([
+ 'contact-method' => 'a',
+ 'email' => 'b',
+ 'language' => 'c',
+ 'real_name' => 'd',
+ 'password' => 'e',
+ 'default-xref' => 'f',
+ 'timezone' => 'g',
+ 'user_name' => 'h',
+ 'visible-online' => 'i',
+ ]);
+ $response = $handler->handle($request);
+
+ $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
+ }
+}
diff --git a/tests/app/Http/RequestHandlers/DeleteUserTest.php b/tests/app/Http/RequestHandlers/DeleteUserTest.php
index 72c6fdcbaa..92639b60f6 100644
--- a/tests/app/Http/RequestHandlers/DeleteUserTest.php
+++ b/tests/app/Http/RequestHandlers/DeleteUserTest.php
@@ -79,7 +79,7 @@ class DeleteUserTest extends TestCase
$user = $this->createMock(User::class);
$user->method('id')->willReturn(1);
- $user->expects($this->once())->method('getPreference')->with('canadmin')->willReturn('1');
+ $user->expects($this->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);
diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php
index 06cbdd0626..60e956a4d0 100644
--- a/tests/app/Module/AhnentafelReportModuleTest.php
+++ b/tests/app/Module/AhnentafelReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class AhnentafelReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php
index 1c0502d7eb..dde50c493d 100644
--- a/tests/app/Module/BirthReportModuleTest.php
+++ b/tests/app/Module/BirthReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class BirthReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php
index f36ef0dc3f..6c99165a57 100644
--- a/tests/app/Module/CemeteryReportModuleTest.php
+++ b/tests/app/Module/CemeteryReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class CemeteryReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php
index af41948d8c..e41b329181 100644
--- a/tests/app/Module/ChangeReportModuleTest.php
+++ b/tests/app/Module/ChangeReportModuleTest.php
@@ -27,6 +27,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -82,7 +83,7 @@ class ChangeReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php
index a678212295..27f6fef821 100644
--- a/tests/app/Module/DeathReportModuleTest.php
+++ b/tests/app/Module/DeathReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class DeathReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php
index bacfe8bab1..a1d7dec0d2 100644
--- a/tests/app/Module/DescendancyReportModuleTest.php
+++ b/tests/app/Module/DescendancyReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class DescendancyReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php
index 356c33cde9..7791ebfc7e 100644
--- a/tests/app/Module/FactSourcesReportModuleTest.php
+++ b/tests/app/Module/FactSourcesReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class FactSourcesReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php
index 5f056b4470..9b8ff9be25 100644
--- a/tests/app/Module/FamilyGroupReportModuleTest.php
+++ b/tests/app/Module/FamilyGroupReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class FamilyGroupReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php
index 829ed44f64..0deb3ba11a 100644
--- a/tests/app/Module/IndividualFamiliesReportModuleTest.php
+++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class IndividualFamiliesReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php
index 5e49d421ab..b29e29791b 100644
--- a/tests/app/Module/IndividualReportModuleTest.php
+++ b/tests/app/Module/IndividualReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -82,7 +83,7 @@ class IndividualReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php
index 8bd4772e4f..e3a992865f 100644
--- a/tests/app/Module/MarriageReportModuleTest.php
+++ b/tests/app/Module/MarriageReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class MarriageReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php
index c7ae9171e7..900d289737 100644
--- a/tests/app/Module/MissingFactsReportModuleTest.php
+++ b/tests/app/Module/MissingFactsReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class MissingFactsReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php
index 705f124c6a..30321edc14 100644
--- a/tests/app/Module/OccupationReportModuleTest.php
+++ b/tests/app/Module/OccupationReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class OccupationReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php
index b0f9687263..660b65089b 100644
--- a/tests/app/Module/PedigreeReportModuleTest.php
+++ b/tests/app/Module/PedigreeReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class PedigreeReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php
index b45754c5e6..744dc27a22 100644
--- a/tests/app/Module/RelatedIndividualsReportModuleTest.php
+++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php
@@ -26,6 +26,7 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
use Fisharebest\Webtrees\Report\ReportPdf;
use Fisharebest\Webtrees\Services\UserService;
use Fisharebest\Webtrees\TestCase;
+use Fisharebest\Webtrees\User;
use Fisharebest\Webtrees\Webtrees;
use League\Flysystem\Adapter\NullAdapter;
use League\Flysystem\Filesystem;
@@ -81,7 +82,7 @@ class RelatedIndividualsReportModuleTest extends TestCase
$data_filesystem = new Filesystem(new NullAdapter());
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree = $this->importTree('demo.ged');
diff --git a/tests/app/Services/UserServiceTest.php b/tests/app/Services/UserServiceTest.php
index 85fd9bc6fa..68d0bc415b 100644
--- a/tests/app/Services/UserServiceTest.php
+++ b/tests/app/Services/UserServiceTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
namespace Fisharebest\Webtrees;
use Fisharebest\Webtrees\Services\UserService;
+use Illuminate\Support\Facades\DB;
/**
* Test the UserService class
@@ -132,7 +133,7 @@ class UserServiceTest extends TestCase
Auth::login($user);
$tree = $this->importTree('demo.ged');
$indi = $tree->createIndividual('0 @@ INDI');
- $tree->setUserPreference($user, 'gedcomid', $indi->xref());
+ $tree->setUserPreference($user, User::PREF_TREE_ACCOUNT_XREF, $indi->xref());
$users = $user_service->findByIndividual($indi);
@@ -167,7 +168,7 @@ class UserServiceTest extends TestCase
$user_service->create('user', 'User', 'user@example.com', 'secret');
$admin = $user_service->create('admin', 'Admin', 'admin@example.com', 'secret');
- $admin->setPreference('canadmin', '1');
+ $admin->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
$users = $user_service->administrators();
@@ -188,10 +189,10 @@ class UserServiceTest extends TestCase
$user4 = $user_service->create('user4', 'User4', 'user4@example.com', 'secret');
$tree = $this->importTree('demo.ged');
- $tree->setUserPreference($user1, 'canedit', 'admin');
- $tree->setUserPreference($user2, 'canedit', 'accept');
- $tree->setUserPreference($user3, 'canedit', 'edit');
- $tree->setUserPreference($user4, 'canedit', 'access');
+ $tree->setUserPreference($user1, User::PREF_TREE_ROLE, User::ROLE_MANAGER);
+ $tree->setUserPreference($user2, User::PREF_TREE_ROLE, User::ROLE_MODERATOR);
+ $tree->setUserPreference($user3, User::PREF_TREE_ROLE, User::ROLE_EDITOR);
+ $tree->setUserPreference($user4, User::PREF_TREE_ROLE, User::ROLE_MEMBER);
$users = $user_service->managers();
@@ -212,10 +213,10 @@ class UserServiceTest extends TestCase
$user4 = $user_service->create('user4', 'User4', 'user4@example.com', 'secret');
$tree = $this->importTree('demo.ged');
- $tree->setUserPreference($user1, 'canedit', 'admin');
- $tree->setUserPreference($user2, 'canedit', 'accept');
- $tree->setUserPreference($user3, 'canedit', 'edit');
- $tree->setUserPreference($user4, 'canedit', 'access');
+ $tree->setUserPreference($user1, User::PREF_TREE_ROLE, User::ROLE_MANAGER);
+ $tree->setUserPreference($user2, User::PREF_TREE_ROLE, User::ROLE_MODERATOR);
+ $tree->setUserPreference($user3, User::PREF_TREE_ROLE, User::ROLE_EDITOR);
+ $tree->setUserPreference($user4, User::PREF_TREE_ROLE, User::ROLE_MEMBER);
$users = $user_service->moderators();
@@ -236,25 +237,25 @@ class UserServiceTest extends TestCase
$user3 = $user_service->create('user3', 'User3', 'user3@example.com', 'secret');
$user4 = $user_service->create('user4', 'User4', 'user4@example.com', 'secret');
- $user1->setPreference('verified', '0');
- $user1->setPreference('verified_by_admin', '0');
- $user2->setPreference('verified', '0');
- $user2->setPreference('verified_by_admin', '1');
- $user3->setPreference('verified', '1');
- $user3->setPreference('verified_by_admin', '0');
- $user4->setPreference('verified', '1');
- $user4->setPreference('verified_by_admin', '1');
+ $user1->setPreference(User::PREF_IS_EMAIL_VERIFIED, '');
+ $user1->setPreference(User::PREF_IS_ACCOUNT_APPROVED, '');
+ $user2->setPreference(User::PREF_IS_EMAIL_VERIFIED, '');
+ $user2->setPreference(User::PREF_IS_ACCOUNT_APPROVED, '1');
+ $user3->setPreference(User::PREF_IS_EMAIL_VERIFIED, '1');
+ $user3->setPreference(User::PREF_IS_ACCOUNT_APPROVED, '');
+ $user4->setPreference(User::PREF_IS_EMAIL_VERIFIED, '1');
+ $user4->setPreference(User::PREF_IS_ACCOUNT_APPROVED, '1');
$users = $user_service->unapproved();
$this->assertSame(2, $users->count());
- $this->assertSame($user1->id(), $users[0]->id());
- $this->assertSame($user3->id(), $users[1]->id());
+ $this->assertSame('user1', $users[0]->userName());
+ $this->assertSame('user3', $users[1]->userName());
$users = $user_service->unverified();
$this->assertSame(2, $users->count());
- $this->assertSame($user1->id(), $users[0]->id());
- $this->assertSame($user2->id(), $users[1]->id());
+ $this->assertSame('user1', $users[0]->userName());
+ $this->assertSame('user2', $users[1]->userName());
}
}
diff --git a/tests/app/TreeTest.php b/tests/app/TreeTest.php
index 4cf907f0e8..6693ffdceb 100644
--- a/tests/app/TreeTest.php
+++ b/tests/app/TreeTest.php
@@ -115,7 +115,7 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree->createIndividual("0 @@ FOO\n1 SEX U");
@@ -131,13 +131,13 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$record = $tree->createIndividual("0 @@ INDI\n1 SEX F\n1 NAME Foo /Bar/");
$this->assertTrue($record->isPendingAddition());
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
$record = $tree->createIndividual("0 @@ INDI\n1 SEX F\n1 NAME Foo /Bar/");
$this->assertFalse($record->isPendingAddition());
}
@@ -154,7 +154,7 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree->createFamily("0 @@ FOO\n1 MARR Y");
@@ -170,13 +170,13 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$record = $tree->createFamily("0 @@ FAM\n1 MARR Y");
$this->assertTrue($record->isPendingAddition());
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
$record = $tree->createFamily("0 @@ FAM\n1 MARR Y");
$this->assertFalse($record->isPendingAddition());
}
@@ -193,7 +193,7 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree->createMediaObject("0 @@ FOO\n1 MARR Y");
@@ -209,13 +209,13 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$record = $tree->createMediaObject("0 @@ OBJE\n1 FILE foo.jpeg");
$this->assertTrue($record->isPendingAddition());
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
$record = $tree->createMediaObject("0 @@ OBJE\n1 FILE foo.jpeg");
$this->assertFalse($record->isPendingAddition());
}
@@ -232,7 +232,7 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$tree->createRecord("0 @@FOO\n1 NOTE noted");
@@ -248,13 +248,13 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$record = $tree->createRecord("0 @@ FOO\n1 NOTE noted");
$this->assertTrue($record->isPendingAddition());
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
$record = $tree->createRecord("0 @@ FOO\n1 NOTE noted");
$this->assertFalse($record->isPendingAddition());
}
@@ -269,7 +269,7 @@ class TreeTest extends TestCase
$tree_service = new TreeService();
$tree = $tree_service->create('name', 'title');
$user = $user_service->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
Auth::login($user);
// Delete the tree's default individual.
@@ -291,11 +291,11 @@ class TreeTest extends TestCase
$this->assertSame($record2->xref(), $tree->significantIndividual($user)->xref());
// User preference
- $tree->setUserPreference($user, 'gedcomid', $record3->xref());
+ $tree->setUserPreference($user, User::PREF_TREE_ACCOUNT_XREF, $record3->xref());
$this->assertSame($record3->xref(), $tree->significantIndividual($user)->xref());
// User record
- $tree->setUserPreference($user, 'rootid', $record4->xref());
+ $tree->setUserPreference($user, User::PREF_TREE_DEFAULT_XREF, $record4->xref());
$this->assertSame($record4->xref(), $tree->significantIndividual($user)->xref());
}
@@ -326,14 +326,14 @@ class TreeTest extends TestCase
$user_service = new UserService();
$tree = $this->importTree('demo.ged');
$user = $user_service->create('admin', 'Administrator', 'admin@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
- $user->setPreference('auto_accept', '1');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '1');
$tree->createIndividual("0 @@ INDI\n1 SEX F\n1 NAME Foo /Bar/");
$this->assertFalse($tree->hasPendingEdit());
- $user->setPreference('auto_accept', '0');
+ $user->setPreference(User::PREF_AUTO_ACCEPT_EDITS, '');
$tree->createIndividual("0 @@ INDI\n1 SEX F\n1 NAME Foo /Bar/");
$this->assertTrue($tree->hasPendingEdit());
}
diff --git a/tests/feature/EmbeddedVariablesTest.php b/tests/feature/EmbeddedVariablesTest.php
index 0e42a3bd5c..2b55c0393f 100644
--- a/tests/feature/EmbeddedVariablesTest.php
+++ b/tests/feature/EmbeddedVariablesTest.php
@@ -81,7 +81,7 @@ class EmbeddedVariablesTest extends TestCase
// As member
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$text = $statistics->embedTags('#getAllTagsTable#');
@@ -103,7 +103,7 @@ class EmbeddedVariablesTest extends TestCase
// As member
$user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
- $user->setPreference('canadmin', '1');
+ $user->setPreference(User::PREF_IS_ADMINISTRATOR, '1');
Auth::login($user);
$text = $statistics->embedTags('#getAllTagsTable#');
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 17:17:10 +0000