Skip intermediate login page with single provider

[bookstack] / tests / Uploads / UsesImages.php

diff --git a/tests/Uploads/UsesImages.php b/tests/Uploads/UsesImages.php
index 251a61c9f5841c2ad9513fbfc7140594b3adb4fc..b55572248a8bc1668da8b34cce264b696c5fa9b7 100644 (file)
--- a/tests/Uploads/UsesImages.php
+++ b/tests/Uploads/UsesImages.php
@@ -1,15 +1,17 @@
-<?php namespace Tests\Uploads;
+<?php

 
 

-use BookStack\Entities\Page;
+namespace Tests\Uploads;
+
+use BookStack\Entities\Models\Page;

 use Illuminate\Http\UploadedFile;
 use Illuminate\Http\UploadedFile;

+use stdClass;

 
 trait UsesImages
 {
     /**
 
 trait UsesImages
 {
     /**

-     * Get the path to our basic test image.
-     * @return string
+     * Get the path to a file in the test-data-directory.

      */
      */

-    protected function getTestImageFilePath(?string $fileName = null)
+    protected function getTestImageFilePath(?string $fileName = null): string

     {
         if (is_null($fileName)) {
             $fileName = 'test-image.png';
     {
         if (is_null($fileName)) {
             $fileName = 'test-image.png';


@@ -19,17 +21,32 @@ trait UsesImages
     }
 
     /**
     }
 
     /**

-     * Get a test image that can be uploaded
-     * @param $fileName
-     * @return UploadedFile
+     * Creates a new temporary image file using the given name,
+     * with the content decoded from the given bas64 file name.
+     * Is generally used for testing sketchy files that could trip AV.
+     */
+    protected function newTestImageFromBase64(string $base64FileName, $imageFileName): UploadedFile
+    {
+        $imagePath = implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), $imageFileName]);
+        $base64FilePath = $this->getTestImageFilePath($base64FileName);
+        $data = file_get_contents($base64FilePath);
+        $decoded = base64_decode($data);
+        file_put_contents($imagePath, $decoded);
+
+        return new UploadedFile($imagePath, $imageFileName, 'image/png', null, true);
+    }
+
+    /**
+     * Get a test image that can be uploaded.

      */
      */

-    protected function getTestImage($fileName, ?string $testDataFileName = null)
+    protected function getTestImage(string $fileName, ?string $testDataFileName = null): UploadedFile

     {
     {

-        return new UploadedFile($this->getTestImageFilePath($testDataFileName), $fileName, 'image/png', 5238, null, true);
+        return new UploadedFile($this->getTestImageFilePath($testDataFileName), $fileName, 'image/png', null, true);

     }
 
     /**
      * Get the raw file data for the test image.
     }
 
     /**
      * Get the raw file data for the test image.

+     *

      * @return false|string
      */
     protected function getTestImageContent()
      * @return false|string
      */
     protected function getTestImageContent()


@@ -39,25 +56,25 @@ trait UsesImages
 
     /**
      * Get the path for a test image.
 
     /**
      * Get the path for a test image.

-     * @param $type
-     * @param $fileName
-     * @return string

      */
      */

-    protected function getTestImagePath($type, $fileName)
+    protected function getTestImagePath(string $type, string $fileName): string

     {
     {

-        return '/uploads/images/' . $type . '/' . Date('Y-m') . '/' . $fileName;
+        return '/uploads/images/' . $type . '/' . date('Y-m') . '/' . $fileName;

     }
 
     /**
      * Uploads an image with the given name.
     }
 
     /**
      * Uploads an image with the given name.

+     *

      * @param $name
      * @param $name

-     * @param int $uploadedTo
+     * @param int    $uploadedTo

      * @param string $contentType
      * @param string $contentType

+     *

      * @return \Illuminate\Foundation\Testing\TestResponse
      */
     protected function uploadImage($name, $uploadedTo = 0, $contentType = 'image/png', ?string $testDataFileName = null)
     {
         $file = $this->getTestImage($name, $testDataFileName);
      * @return \Illuminate\Foundation\Testing\TestResponse
      */
     protected function uploadImage($name, $uploadedTo = 0, $contentType = 'image/png', ?string $testDataFileName = null)
     {
         $file = $this->getTestImage($name, $testDataFileName);

+

         return $this->withHeader('Content-Type', $contentType)
             ->call('POST', '/images/gallery', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
     }
         return $this->withHeader('Content-Type', $contentType)
             ->call('POST', '/images/gallery', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
     }


@@ -66,8 +83,10 @@ trait UsesImages
      * Upload a new gallery image.
      * Returns the image name.
      * Can provide a page to relate the image to.
      * Upload a new gallery image.
      * Returns the image name.
      * Can provide a page to relate the image to.

+     *

      * @param Page|null $page
      * @param Page|null $page

-     * @return array
+     *
+     * @return array{name: string, path: string, page: Page, response: stdClass}

      */
     protected function uploadGalleryImage(Page $page = null, ?string $testDataFileName = null)
     {
      */
     protected function uploadGalleryImage(Page $page = null, ?string $testDataFileName = null)
     {


@@ -81,24 +100,23 @@ trait UsesImages
 
         $upload = $this->uploadImage($imageName, $page->id, 'image/png', $testDataFileName);
         $upload->assertStatus(200);
 
         $upload = $this->uploadImage($imageName, $page->id, 'image/png', $testDataFileName);
         $upload->assertStatus(200);

+

         return [
         return [

-            'name' => $imageName,
-            'path' => $relPath,
-            'page' => $page,
+            'name'     => $imageName,
+            'path'     => $relPath,
+            'page'     => $page,

             'response' => json_decode($upload->getContent()),
         ];
     }
 
     /**
      * Delete an uploaded image.
             'response' => json_decode($upload->getContent()),
         ];
     }
 
     /**
      * Delete an uploaded image.

-     * @param $relPath

      */
      */

-    protected function deleteImage($relPath)
+    protected function deleteImage(string $relPath)

     {
         $path = public_path($relPath);
         if (file_exists($path)) {
             unlink($path);
         }
     }
     {
         $path = public_path($relPath);
         if (file_exists($path)) {
             unlink($path);
         }
     }

-
-}
\ No newline at end of file
+}