update tests

.gitignore

@@ -32,8 +32,8 @@ customs/interfaces/*
 !customs/interfaces/_example
 /customs/listviews/*
 !customs/listviews/.gitignore
-!storage/uploads/.gitignore
-!storage/uploads/thumbs/.gitignore
+!public/uploads/_/originals/.gitignore
+!public/uploads/_/thumbnails/.gitignore
 
 thumbnail/**/
 

tests/io/ActivityCommentTest.php

@@ -96,7 +96,7 @@ public static function clearData()
         reset_table_id(static::$db, 'directus_users', 4);
         reset_table_id(static::$db, 'directus_files', 2);
         truncate_table(static::$db, 'directus_folders');
-        $storagePath = __DIR__ . '/../../public/storage';
+        $storagePath = __DIR__ . '/../../public/uploads/_/originals';
 
         clear_storage($storagePath);
     }

tests/io/AuthenticationTest.php

@@ -2,10 +2,12 @@
 
 namespace Directus\Tests\Api\Io;
 
+use function Directus\array_get;
 use Directus\Authentication\Exception\ExpiredTokenException;
 use Directus\Authentication\Exception\InvalidTokenException;
 use Directus\Authentication\Exception\InvalidUserCredentialsException;
 use Directus\Authentication\Exception\UserInactiveException;
+use Directus\Authentication\Provider;
 use Directus\Util\JWTUtils;
 use Directus\Validator\Exception\InvalidRequestException;
 use GuzzleHttp\Exception\ClientException;
@@ -178,7 +180,7 @@ public function testInvalidTokenRefresh()
 
         // valid but expired token
         $response = request_error_post($path, [
-            'token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwiZXhwIjoxNTM0NTE1MTA4LCJ0eXBlIjoiYXV0aCJ9.Ux3JhxReqiSZIJOb_7_-R-1JzJ4krYRodyco09ZG6gI'
+            'token' => $this->generateExpiredToken()
         ]);
 
         assert_response_error($this, $response, [
@@ -209,4 +211,18 @@ public function testDisabledUserToken()
             'code' => UserInactiveException::ERROR_CODE
         ]);
     }
+
+    protected function generateExpiredToken()
+    {
+        $config = require __DIR__ . '/../../config/api.php';
+        $secretKey = array_get($config, 'auth.secret_key');
+
+        $payload = [
+            'id' => 1,
+            'type' => JWTUtils::TYPE_AUTH,
+            'exp' => time() - 3600,
+        ];
+
+        return JWTUtils::encode($payload, $secretKey, 'HS256');
+    }
 }

tests/io/FilesTest.php

@@ -23,15 +23,9 @@ class FilesTest extends \PHPUnit_Framework_TestCase
      */
     protected static $uploadPath;
 
-    /**
-     * @var string
-     */
-    protected static $thumbsPath;
-
     public static function resetDatabase()
     {
-        static::$uploadPath = realpath(__DIR__ . '/../../public/storage/uploads');
-        static::$thumbsPath = static::$uploadPath . '/thumbs';
+        static::$uploadPath = realpath(__DIR__ . '/../../public/uploads/_/originals');
 
         static::$db = create_db_connection();
         reset_table_id(static::$db, 'directus_files', 2);
@@ -214,7 +208,6 @@ public function testDelete()
         ]);
 
         $this->assertFalse(file_exists(static::$uploadPath . '/' . static::$fileName));
-        $this->assertFalse(file_exists(static::$thumbsPath . '/2.jpg'));
 
         // delete second file
         $response = request_delete('files/4', ['query' => $this->queryParams]);
@@ -227,7 +220,6 @@ public function testDelete()
         ]);
 
         $this->assertFalse(file_exists(static::$uploadPath . '/' . static::$fileName2));
-        $this->assertFalse(file_exists(static::$thumbsPath . '/4.jpg'));
     }
 
     protected function getImageBase64()

tests/io/ItemsBatchTest.php

@@ -26,7 +26,7 @@ public static function resetData()
             ['name' => 'Old Category']
         ]);
         fill_table(static::$db, 'products', static::$data);
-        $uploadPath = realpath(__DIR__ . '/../../public/storage/uploads');
+        $uploadPath = realpath(__DIR__ . '/../../public/uploads/_/originals');
         clear_storage($uploadPath);
 
         request_patch('fields/products/status', ['options' => [

tests/io/ItemsTest.php

@@ -41,7 +41,7 @@ public static function resetData()
             ['name' => 'Old Category']
         ]);
         fill_table(static::$db, 'products', static::$data);
-        $uploadPath = realpath(__DIR__ . '/../../public/storage/uploads');
+        $uploadPath = realpath(__DIR__ . '/../../public/uploads/_/originals');
         clear_storage($uploadPath);
 
         request_patch('fields/products/status', ['options' => [

tests/utils/helper.php

@@ -55,15 +55,4 @@ function clear_storage($basePath)
 
         unlink($filename);
     }
-
-    $thumbsOmit = ['.gitignore', '1.jpg'];
-    $thumbsPath = $basePath . '/thumbs';
-    foreach (glob($thumbsPath . "/*.*") as $filename) {
-        $name = basename($filename);
-        if (is_dir($filename) || in_array($name, $thumbsOmit)) {
-            continue;
-        }
-
-        unlink($filename);
-    }
 }