-
-
-
{{ trans('settings.users_migrate_ownership_desc') }}
+
+
+
+
{{ trans('settings.users_migrate_ownership_desc') }}
+
+
+ @include('form.user-select', ['name' => 'new_owner_id', 'user' => null, 'compact' => false])
+
-
- @include('form.user-select', ['name' => 'new_owner_id', 'user' => null, 'compact' => false])
-
-
+ @endif
diff --git a/tests/Api/SearchApiTest.php b/tests/Api/SearchApiTest.php
index 55ca0e009..1f38c7fd9 100644
--- a/tests/Api/SearchApiTest.php
+++ b/tests/Api/SearchApiTest.php
@@ -36,6 +36,38 @@ class SearchApiTest extends TestCase
$resp->assertJsonFragment(['name' => $uniqueTerm, 'type' => 'bookshelf']);
}
+ public function test_all_endpoint_returns_entity_url()
+ {
+ /** @var Page $page */
+ $page = Page::query()->first();
+ $page->update(['name' => 'name with superuniquevalue within']);
+ $page->indexForSearch();
+
+ $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
+ $resp->assertJsonFragment([
+ 'type' => 'page',
+ 'url' => $page->getUrl(),
+ ]);
+ }
+
+ public function test_all_endpoint_returns_items_with_preview_html()
+ {
+ /** @var Book $book */
+ $book = Book::query()->first();
+ $book->update(['name' => 'name with superuniquevalue within', 'description' => 'Description with superuniquevalue within']);
+ $book->indexForSearch();
+
+ $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
+ $resp->assertJsonFragment([
+ 'type' => 'book',
+ 'url' => $book->getUrl(),
+ 'preview_html' => [
+ 'name' => 'name with
superuniquevalue within',
+ 'content' => 'Description with
superuniquevalue within',
+ ],
+ ]);
+ }
+
public function test_all_endpoint_requires_query_parameter()
{
$resp = $this->actingAsApiEditor()->get($this->baseEndpoint);
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 5a36b85df..94970df4f 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -130,6 +130,21 @@ class UserManagementTest extends TestCase
$resp->assertSee('new_owner_id');
}
+ public function test_migrate_option_hidden_if_user_cannot_manage_users()
+ {
+ $editor = $this->getEditor();
+
+ $resp = $this->asEditor()->get("settings/users/{$editor->id}/delete");
+ $resp->assertDontSee('Migrate Ownership');
+ $resp->assertDontSee('new_owner_id');
+
+ $this->giveUserPermissions($editor, ['users-manage']);
+
+ $resp = $this->asEditor()->get("settings/users/{$editor->id}/delete");
+ $resp->assertSee('Migrate Ownership');
+ $resp->assertSee('new_owner_id');
+ }
+
public function test_delete_with_new_owner_id_changes_ownership()
{
$page = Page::query()->first();
diff --git a/tests/User/UserSearchTest.php b/tests/User/UserSearchTest.php
new file mode 100644
index 000000000..243af1186
--- /dev/null
+++ b/tests/User/UserSearchTest.php
@@ -0,0 +1,66 @@
+getViewer();
+ $admin = $this->getAdmin();
+ $resp = $this->actingAs($admin)->get('/search/users/select?search=' . urlencode($viewer->name));
+
+ $resp->assertOk();
+ $resp->assertSee($viewer->name);
+ $resp->assertDontSee($admin->name);
+ }
+
+ public function test_select_search_shows_first_by_name_without_search()
+ {
+ /** @var User $firstUser */
+ $firstUser = User::query()->orderBy('name', 'desc')->first();
+ $resp = $this->asAdmin()->get('/search/users/select');
+
+ $resp->assertOk();
+ $resp->assertSee($firstUser->name);
+ }
+
+ public function test_select_search_does_not_match_by_email()
+ {
+ $viewer = $this->getViewer();
+ $editor = $this->getEditor();
+ $resp = $this->actingAs($editor)->get('/search/users/select?search=' . urlencode($viewer->email));
+
+ $resp->assertDontSee($viewer->name);
+ }
+
+ public function test_select_requires_right_permission()
+ {
+ $permissions = ['users-manage', 'restrictions-manage-own', 'restrictions-manage-all'];
+ $user = $this->getViewer();
+
+ foreach ($permissions as $permission) {
+ $resp = $this->actingAs($user)->get('/search/users/select?search=a');
+ $this->assertPermissionError($resp);
+
+ $this->giveUserPermissions($user, [$permission]);
+ $resp = $this->actingAs($user)->get('/search/users/select?search=a');
+ $resp->assertOk();
+ $user->roles()->delete();
+ $user->clearPermissionCache();
+ }
+ }
+
+ public function test_select_requires_logged_in_user()
+ {
+ $this->setSettings(['app-public' => true]);
+ $defaultUser = User::getDefault();
+ $this->giveUserPermissions($defaultUser, ['users-manage']);
+
+ $resp = $this->get('/search/users/select?search=a');
+ $this->assertPermissionError($resp);
+ }
+}