Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mysql ci #2228

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/BackgroundJobTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ public function testGCJob() : void {
*/
public function singleBookmarksProvider() {
return array_map(function ($props) {
return Bookmark::fromArray($props + ['userId' => 'test']);
return Bookmark::fromArray(array_merge($props, ['userId' => 'test']));
}, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
'Simple URL' => ['url' => 'https://php.net/'],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
'Simple URL' => ['url' => 'https://php.net/', 'title' => '', 'description' => ''],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/', 'title' => '', 'description' => ''],
]);
}
}
1 change: 1 addition & 0 deletions tests/BookmarkControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ public function setupBookmarksWithPublicFolder(): void {
$this->treeMapper->move(TreeMapper::TYPE_FOLDER, $this->folder2->getId(), $this->folder1->getId());

$this->publicFolder = new PublicFolder();
$this->publicFolder->setDescription('');
$this->publicFolder->setFolderId($this->folder1->getId());
$this->publicFolderMapper->insert($this->publicFolder);

Expand Down
8 changes: 4 additions & 4 deletions tests/BookmarkMapperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ public function testDelete(Entity $bookmark) {
* @return array
*/
public function singleBookmarksProvider(): array {
return array_map(static function ($props) {
return array_map(function ($props) {
return [Db\Bookmark::fromArray($props)];
}, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
'Simple URL' => ['url' => 'https://php.net/'],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
'Simple URL' => ['url' => 'https://php.net/', 'title' => '', 'description' => ''],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
]);
}
}
11 changes: 6 additions & 5 deletions tests/FindTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ public function testFindAllWithAnd() {

$params = new QueryParameters();
$bookmarks = $this->bookmarkMapper->findAll($this->userId, $params->setSearch(['.com']));
$this->assertCount(2, $bookmarks);
$this->assertCount(3, $bookmarks);
}


public function testFindAllWithOr() {
$params = new QueryParameters();
$bookmarks = $this->bookmarkMapper->findAll($this->userId, $params->setSearch(['wikipedia', 'nextcloud'])->setConjunction(QueryParameters::CONJ_OR));
$this->assertCount(2, $bookmarks);
$this->assertCount(3, $bookmarks);
}

public function testFindByTags() {
Expand All @@ -120,9 +120,10 @@ public function singleBookmarksProvider() {
return [$data[0], Db\Bookmark::fromArray($data[1])];
}, [
[['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
[['three', 'one'], ['url' => 'https://php.net/']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => '']],
[['three', 'one'], ['url' => 'https://php.net/', 'title' => '', 'description' => '']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => '']],
[[],['url' => 'https://github.com/nextcloud/bookmarks/projects/1', 'title' => '', 'description' => '']],
]);
}
}
1 change: 1 addition & 0 deletions tests/FolderControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ public function setupBookmarks() {
public function setupPublicFolder(): void {
$this->authorizer->setUserId($this->userId);
$this->publicFolder = new PublicFolder();
$this->publicFolder->setDescription('');
$this->publicFolder->setFolderId($this->folder1->getId());
$this->publicFolderMapper->insert($this->publicFolder);

Expand Down
8 changes: 4 additions & 4 deletions tests/HtmlImportExportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ public function exportProvider(): array {
return Db\Bookmark::fromArray($props);
}, [
['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
['url' => 'https://php.net/'],
['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
['url' => 'https://github.com/nextcloud/bookmarks/projects/1'],
['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
['url' => 'https://php.net/', 'title' => '', 'description' => ''],
['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
['url' => 'https://github.com/nextcloud/bookmarks/projects/1', 'title' => '', 'description' => ''],
]),
];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/PublicFolderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function setUp(): void {
$this->folder = Db\Folder::fromParams(['title' => 'test', 'userId' => $this->userId]);
$this->folderMapper->insert($this->folder);

$this->publicFolder = Db\PublicFolder::fromParams(['folderId' => $this->folder->getId()]);
$this->publicFolder = Db\PublicFolder::fromParams(['folderId' => $this->folder->getId(), 'description' => '']);
$this->folderPublicMapper->insert($this->publicFolder);
}

Expand Down
6 changes: 3 additions & 3 deletions tests/TagMapperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ public function singleBookmarksProvider() {
return [$data[0], Db\Bookmark::fromArray($data[1])];
}, [
[['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
[['three', 'one'], ['url' => 'https://php.net/']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => '']],
[['three', 'one'], ['url' => 'https://php.net/', 'title' => '', 'description' => '']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => '']],
]);
}
}
Loading