]> BookStack Code Mirror - bookstack/commitdiff
Fixed test failing from missing baseURL
authorDan Brown <redacted>
Sun, 28 Jan 2018 13:27:41 +0000 (13:27 +0000)
committerDan Brown <redacted>
Sun, 28 Jan 2018 13:27:41 +0000 (13:27 +0000)
Also updated image upload test to delete before upload to prevent failed
tests breaking subsequent tests.

tests/BrowserKitTest.php
tests/ImageTest.php

index b5c32cef5c1d5763a8be0785c32f8272121454a8..a8ff0304422cfef5cf04a964e011cb3b3ff43de1 100644 (file)
@@ -17,6 +17,12 @@ abstract class BrowserKitTest extends TestCase
     private $admin;
     private $editor;
 
+    /**
+     * The base URL to use while testing the application.
+     * @var string
+     */
+    protected $baseUrl = 'http://localhost';
+
     public function tearDown()
     {
         \DB::disconnect();
index 822cc969ba2185a9087b35e5ab3d57523eccdc2c..c75617c0e1578e0e5f8cbd6e0837cd10251b45dd 100644 (file)
@@ -5,7 +5,6 @@ use BookStack\Page;
 
 class ImageTest extends TestCase
 {
-
     /**
      * Get the path to our basic test image.
      * @return string
@@ -54,20 +53,25 @@ class ImageTest extends TestCase
      */
     protected function deleteImage($relPath)
     {
-        unlink(public_path($relPath));
+        $path = public_path($relPath);
+        if (file_exists($path)) {
+            unlink($path);
+        }
     }
 
 
     public function test_image_upload()
     {
         $page = Page::first();
-        $this->asAdmin();
         $admin = $this->getAdmin();
+        $this->actingAs($admin);
+
         $imageName = 'first-image.png';
+        $relPath = $this->getTestImagePath('gallery', $imageName);
+        $this->deleteImage($relPath);
 
         $upload = $this->uploadImage($imageName, $page->id);
         $upload->assertStatus(200);
-        $relPath = $this->getTestImagePath('gallery', $imageName);
 
         $this->assertTrue(file_exists(public_path($relPath)), 'Uploaded image not found at path: '. public_path($relPath));