webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Fixed issue caused by changing test method defaults

Browse Source
This commit is contained in:
Dan Brown
2022-05-22 11:58:22 +01:00
parent c9aa1c979f
commit b69722c3b5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Uploads/UsesImages.php
View File

@@ -40,9 +40,9 @@ trait UsesImages
/** /**
* Get a test image that can be uploaded. * Get a test image that can be uploaded.
*/ */
protected function getTestImage(string $fileName, ?string $testDataFileName = null): UploadedFile protected function getTestImage(string $fileName, ?string $testDataFileName = null, $mimeType = 'image/png'): UploadedFile
{ {
return new UploadedFile($this->getTestImageFilePath($testDataFileName), $fileName, 'image/png', null, true); return new UploadedFile($this->getTestImageFilePath($testDataFileName), $fileName, $mimeType, null, true);
} }
/** /**
@@ -74,7 +74,7 @@ trait UsesImages
*/ */
protected function uploadImage($name, $uploadedTo = 0, $contentType = 'image/png', ?string $testDataFileName = null) protected function uploadImage($name, $uploadedTo = 0, $contentType = 'image/png', ?string $testDataFileName = null)
{ {
$file = $this->getTestImage($name, $testDataFileName); $file = $this->getTestImage($name, $testDataFileName, $contentType);
return $this->withHeader('Content-Type', $contentType) return $this->withHeader('Content-Type', $contentType)
->call('POST', '/images/gallery', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []); ->call('POST', '/images/gallery', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
@@ -87,13 +87,13 @@ trait UsesImages
* *
* @return array{name: string, path: string, page: Page, response: stdClass} * @return array{name: string, path: string, page: Page, response: stdClass}
*/ */
protected function uploadGalleryImage(Page $page = null, string $testDataFileName = 'first-image.png', string $contentType = 'image/png') protected function uploadGalleryImage(Page $page = null, string $testDataFileName = null, string $contentType = 'image/png')
{ {
if ($page === null) { if ($page === null) {
$page = Page::query()->first(); $page = Page::query()->first();
} }
$imageName = $testDataFileName; $imageName = $testDataFileName ?? 'first-image.png';
$relPath = $this->getTestImagePath('gallery', $imageName); $relPath = $this->getTestImagePath('gallery', $imageName);
$this->deleteImage($relPath); $this->deleteImage($relPath);