Modernize third party services' logos

[bookstack] / tests / Uploads / AttachmentTest.php

diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index 55a5aa84fed023e82f2c384d8b13327231dae8c2..60fd370b676d0d592be5bfad9610ff04c0e55dcf 100644 (file)
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -1,9 +1,11 @@
-<?php namespace Tests\Uploads;
+<?php

 
 

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

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\PageRepo;

+use BookStack\Entities\Tools\TrashCan;

 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Attachment;

-use BookStack\Entities\Models\Page;

 use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\UploadedFile;
 use Tests\TestCase;
 use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\UploadedFile;
 use Tests\TestCase;


@@ -11,7 +13,7 @@ use Tests\TestCase;
 class AttachmentTest extends TestCase
 {
     /**
 class AttachmentTest extends TestCase
 {
     /**

-     * Get a test file that can be uploaded
+     * Get a test file that can be uploaded.

      */
     protected function getTestFile(string $fileName): UploadedFile
     {
      */
     protected function getTestFile(string $fileName): UploadedFile
     {


@@ -24,17 +26,18 @@ class AttachmentTest extends TestCase
     protected function uploadFile(string $name, int $uploadedTo = 0): \Illuminate\Foundation\Testing\TestResponse
     {
         $file = $this->getTestFile($name);
     protected function uploadFile(string $name, int $uploadedTo = 0): \Illuminate\Foundation\Testing\TestResponse
     {
         $file = $this->getTestFile($name);

+

         return $this->call('POST', '/attachments/upload', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
     }
 
     /**
         return $this->call('POST', '/attachments/upload', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
     }
 
     /**

-     * Create a new attachment
+     * Create a new attachment.

      */
     protected function createAttachment(Page $page): Attachment
     {
         $this->post('attachments/link', [
      */
     protected function createAttachment(Page $page): Attachment
     {
         $this->post('attachments/link', [

-            'attachment_link_url' => 'https://example.com',
-            'attachment_link_name' => 'Example Attachment Link',
+            'attachment_link_url'         => 'https://example.com',
+            'attachment_link_name'        => 'Example Attachment Link',

             'attachment_link_uploaded_to' => $page->id,
         ]);
 
             'attachment_link_uploaded_to' => $page->id,
         ]);
 


@@ -61,10 +64,10 @@ class AttachmentTest extends TestCase
         $fileName = 'upload_test_file.txt';
 
         $expectedResp = [
         $fileName = 'upload_test_file.txt';
 
         $expectedResp = [

-            'name' => $fileName,
+            'name'       => $fileName,

             'uploaded_to'=> $page->id,
             'uploaded_to'=> $page->id,

-            'extension' => 'txt',
-            'order' => 1,
+            'extension'  => 'txt',
+            'order'      => 1,

             'created_by' => $admin->id,
             'updated_by' => $admin->id,
         ];
             'created_by' => $admin->id,
             'updated_by' => $admin->id,
         ];


@@ -73,9 +76,9 @@ class AttachmentTest extends TestCase
         $upload->assertStatus(200);
 
         $attachment = Attachment::query()->orderBy('id', 'desc')->first();
         $upload->assertStatus(200);
 
         $attachment = Attachment::query()->orderBy('id', 'desc')->first();

-        $expectedResp['path'] = $attachment->path;
-

         $upload->assertJson($expectedResp);
         $upload->assertJson($expectedResp);

+
+        $expectedResp['path'] = $attachment->path;

         $this->assertDatabaseHas('attachments', $expectedResp);
 
         $this->deleteUploads();
         $this->assertDatabaseHas('attachments', $expectedResp);
 
         $this->deleteUploads();


@@ -86,7 +89,6 @@ class AttachmentTest extends TestCase
         $page = Page::query()->first();
         $fileName = 'upload_test_file.txt';
 
         $page = Page::query()->first();
         $fileName = 'upload_test_file.txt';
 

-

         $upload = $this->asAdmin()->uploadFile($fileName, $page->id);
         $upload->assertStatus(200);
 
         $upload = $this->asAdmin()->uploadFile($fileName, $page->id);
         $upload->assertStatus(200);
 


@@ -122,20 +124,20 @@ class AttachmentTest extends TestCase
         $this->asAdmin();
 
         $linkReq = $this->call('POST', 'attachments/link', [
         $this->asAdmin();
 
         $linkReq = $this->call('POST', 'attachments/link', [

-            'attachment_link_url' => 'https://example.com',
-            'attachment_link_name' => 'Example Attachment Link',
+            'attachment_link_url'         => 'https://example.com',
+            'attachment_link_name'        => 'Example Attachment Link',

             'attachment_link_uploaded_to' => $page->id,
         ]);
 
         $expectedData = [
             'attachment_link_uploaded_to' => $page->id,
         ]);
 
         $expectedData = [

-            'path' => 'https://example.com',
-            'name' => 'Example Attachment Link',
+            'path'        => 'https://example.com',
+            'name'        => 'Example Attachment Link',

             'uploaded_to' => $page->id,
             'uploaded_to' => $page->id,

-            'created_by' => $admin->id,
-            'updated_by' => $admin->id,
-            'external' => true,
-            'order' => 1,
-            'extension' => ''
+            'created_by'  => $admin->id,
+            'updated_by'  => $admin->id,
+            'external'    => true,
+            'order'       => 1,
+            'extension'   => '',

         ];
 
         $linkReq->assertStatus(200);
         ];
 
         $linkReq->assertStatus(200);


@@ -160,14 +162,14 @@ class AttachmentTest extends TestCase
         $attachment = $this->createAttachment($page);
         $update = $this->call('PUT', 'attachments/' . $attachment->id, [
             'attachment_edit_name' => 'My new attachment name',
         $attachment = $this->createAttachment($page);
         $update = $this->call('PUT', 'attachments/' . $attachment->id, [
             'attachment_edit_name' => 'My new attachment name',

-            'attachment_edit_url' => 'https://test.example.com'
+            'attachment_edit_url'  => 'https://test.example.com',

         ]);
 
         $expectedData = [
         ]);
 
         $expectedData = [

-            'id' => $attachment->id,
-            'path' => 'https://test.example.com',
-            'name' => 'My new attachment name',
-            'uploaded_to' => $page->id
+            'id'          => $attachment->id,
+            'path'        => 'https://test.example.com',
+            'name'        => 'My new attachment name',
+            'uploaded_to' => $page->id,

         ];
 
         $update->assertStatus(200);
         ];
 
         $update->assertStatus(200);


@@ -191,7 +193,7 @@ class AttachmentTest extends TestCase
         $this->delete($attachment->getUrl());
 
         $this->assertDatabaseMissing('attachments', [
         $this->delete($attachment->getUrl());
 
         $this->assertDatabaseMissing('attachments', [

-            'name' => $fileName
+            'name' => $fileName,

         ]);
         $this->assertFalse(file_exists($filePath), 'File at path ' . $filePath . ' was not deleted as expected');
 
         ]);
         $this->assertFalse(file_exists($filePath), 'File at path ' . $filePath . ' was not deleted as expected');
 


@@ -210,14 +212,14 @@ class AttachmentTest extends TestCase
 
         $this->assertTrue(file_exists($filePath), 'File at path ' . $filePath . ' does not exist');
         $this->assertDatabaseHas('attachments', [
 
         $this->assertTrue(file_exists($filePath), 'File at path ' . $filePath . ' does not exist');
         $this->assertDatabaseHas('attachments', [

-            'name' => $fileName
+            'name' => $fileName,

         ]);
 
         app(PageRepo::class)->destroy($page);
         app(TrashCan::class)->empty();
 
         $this->assertDatabaseMissing('attachments', [
         ]);
 
         app(PageRepo::class)->destroy($page);
         app(TrashCan::class)->empty();
 
         $this->assertDatabaseMissing('attachments', [

-            'name' => $fileName
+            'name' => $fileName,

         ]);
         $this->assertFalse(file_exists($filePath), 'File at path ' . $filePath . ' was not deleted as expected');
 
         ]);
         $this->assertFalse(file_exists($filePath), 'File at path ' . $filePath . ' was not deleted as expected');
 


@@ -229,7 +231,6 @@ class AttachmentTest extends TestCase
         $admin = $this->getAdmin();
         $viewer = $this->getViewer();
         $page = Page::query()->first(); /** @var Page $page */
         $admin = $this->getAdmin();
         $viewer = $this->getViewer();
         $page = Page::query()->first(); /** @var Page $page */

-

         $this->actingAs($admin);
         $fileName = 'permission_test.txt';
         $this->uploadFile($fileName, $page->id);
         $this->actingAs($admin);
         $fileName = 'permission_test.txt';
         $this->uploadFile($fileName, $page->id);


@@ -244,7 +245,7 @@ class AttachmentTest extends TestCase
         $this->actingAs($viewer);
         $attachmentGet = $this->get($attachment->getUrl());
         $attachmentGet->assertStatus(404);
         $this->actingAs($viewer);
         $attachmentGet = $this->get($attachment->getUrl());
         $attachmentGet->assertStatus(404);

-        $attachmentGet->assertSee("Attachment not found");
+        $attachmentGet->assertSee('Attachment not found');

 
         $this->deleteUploads();
     }
 
         $this->deleteUploads();
     }


@@ -259,15 +260,15 @@ class AttachmentTest extends TestCase
             ' javascript:alert("bunny")',
             'JavaScript:alert("bunny")',
             "\t\n\t\nJavaScript:alert(\"bunny\")",
             ' javascript:alert("bunny")',
             'JavaScript:alert("bunny")',
             "\t\n\t\nJavaScript:alert(\"bunny\")",

-            "data:text/html;<a></a>",
-            "Data:text/html;<a></a>",
-            "Data:text/html;<a></a>",
+            'data:text/html;<a></a>',
+            'Data:text/html;<a></a>',
+            'Data:text/html;<a></a>',

         ];
 
         foreach ($badLinks as $badLink) {
             $linkReq = $this->post('attachments/link', [
         ];
 
         foreach ($badLinks as $badLink) {
             $linkReq = $this->post('attachments/link', [

-                'attachment_link_url' => $badLink,
-                'attachment_link_name' => 'Example Attachment Link',
+                'attachment_link_url'         => $badLink,
+                'attachment_link_name'        => 'Example Attachment Link',

                 'attachment_link_uploaded_to' => $page->id,
             ]);
             $linkReq->assertStatus(422);
                 'attachment_link_uploaded_to' => $page->id,
             ]);
             $linkReq->assertStatus(422);


@@ -280,7 +281,7 @@ class AttachmentTest extends TestCase
 
         foreach ($badLinks as $badLink) {
             $linkReq = $this->put('attachments/' . $attachment->id, [
 
         foreach ($badLinks as $badLink) {
             $linkReq = $this->put('attachments/' . $attachment->id, [

-                'attachment_edit_url' => $badLink,
+                'attachment_edit_url'  => $badLink,

                 'attachment_edit_name' => 'Example Attachment Link',
             ]);
             $linkReq->assertStatus(422);
                 'attachment_edit_name' => 'Example Attachment Link',
             ]);
             $linkReq->assertStatus(422);


@@ -303,7 +304,7 @@ class AttachmentTest extends TestCase
         $attachmentGet = $this->get($attachment->getUrl(true));
         // http-foundation/Response does some 'fixing' of responses to add charsets to text responses.
         $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
         $attachmentGet = $this->get($attachment->getUrl(true));
         // http-foundation/Response does some 'fixing' of responses to add charsets to text responses.
         $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=UTF-8');

-        $attachmentGet->assertHeader('Content-Disposition', "inline; filename=\"upload_test_file.txt\"");
+        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename="upload_test_file.txt"');

 
         $this->deleteUploads();
     }
 
         $this->deleteUploads();
     }