mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
Merge remote-tracking branch 'origin/1.9.x' into pr-12231
This commit is contained in:
@@ -881,6 +881,13 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
|
||||
- _APP_ENV
|
||||
- _APP_WORKER_PER_CORE
|
||||
- _APP_OPENSSL_KEY_V1
|
||||
- _APP_OPTIONS_FORCE_HTTPS
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_DOMAIN_FUNCTIONS
|
||||
- _APP_DOMAIN_SITES
|
||||
- _APP_MIGRATION_HOST
|
||||
- _APP_CONSOLE_SCHEMA
|
||||
- _APP_REDIS_HOST
|
||||
- _APP_REDIS_PORT
|
||||
- _APP_REDIS_USER
|
||||
@@ -909,6 +916,13 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
|
||||
- _APP_ENV
|
||||
- _APP_WORKER_PER_CORE
|
||||
- _APP_OPENSSL_KEY_V1
|
||||
- _APP_OPTIONS_FORCE_HTTPS
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_DOMAIN_FUNCTIONS
|
||||
- _APP_DOMAIN_SITES
|
||||
- _APP_MIGRATION_HOST
|
||||
- _APP_CONSOLE_SCHEMA
|
||||
- _APP_REDIS_HOST
|
||||
- _APP_REDIS_PORT
|
||||
- _APP_REDIS_USER
|
||||
|
||||
+15
-1
@@ -1114,6 +1114,13 @@ services:
|
||||
- _APP_WORKER_PER_CORE
|
||||
- _APP_POOL_ADAPTER
|
||||
- _APP_OPENSSL_KEY_V1
|
||||
- _APP_OPTIONS_FORCE_HTTPS
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_DOMAIN_FUNCTIONS
|
||||
- _APP_DOMAIN_SITES
|
||||
- _APP_MIGRATION_HOST
|
||||
- _APP_CONSOLE_SCHEMA
|
||||
- _APP_REDIS_HOST
|
||||
- _APP_REDIS_PORT
|
||||
- _APP_REDIS_USER
|
||||
@@ -1145,6 +1152,13 @@ services:
|
||||
- _APP_WORKER_PER_CORE
|
||||
- _APP_POOL_ADAPTER
|
||||
- _APP_OPENSSL_KEY_V1
|
||||
- _APP_OPTIONS_FORCE_HTTPS
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_DOMAIN_FUNCTIONS
|
||||
- _APP_DOMAIN_SITES
|
||||
- _APP_MIGRATION_HOST
|
||||
- _APP_CONSOLE_SCHEMA
|
||||
- _APP_REDIS_HOST
|
||||
- _APP_REDIS_PORT
|
||||
- _APP_REDIS_USER
|
||||
@@ -1478,4 +1492,4 @@ volumes:
|
||||
appwrite-sites:
|
||||
appwrite-builds:
|
||||
appwrite-config:
|
||||
appwrite-models:
|
||||
appwrite-models:
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace Tests\E2E\Services\GraphQL;
|
||||
|
||||
use CURLFile;
|
||||
use Utopia\Console;
|
||||
use Utopia\Image\Image;
|
||||
|
||||
trait Base
|
||||
{
|
||||
@@ -516,6 +517,21 @@ trait Base
|
||||
}
|
||||
';
|
||||
|
||||
protected function assertFilePreviewResponse(array $file): void
|
||||
{
|
||||
$this->assertEquals(200, $file['headers']['status-code']);
|
||||
$this->assertEquals('image/png', $file['headers']['content-type']);
|
||||
$this->assertNotEmpty($file['body']);
|
||||
|
||||
$image = new Image($file['body']);
|
||||
$dimensions = \getimagesizefromstring($file['body']);
|
||||
|
||||
$this->assertNotEmpty($image->output('png'));
|
||||
$this->assertIsArray($dimensions);
|
||||
$this->assertEquals(100, $dimensions[0]);
|
||||
$this->assertEquals(100, $dimensions[1]);
|
||||
}
|
||||
|
||||
public function getQuery(string $name): string
|
||||
{
|
||||
switch ($name) {
|
||||
@@ -2388,8 +2404,8 @@ trait Base
|
||||
}
|
||||
}';
|
||||
case self::GET_FILE_PREVIEW:
|
||||
return 'query getFilePreview($bucketId: String!, $fileId: String!) {
|
||||
storageGetFilePreview(bucketId: $bucketId, fileId: $fileId) {
|
||||
return 'query getFilePreview($bucketId: String!, $fileId: String!, $width: Int, $height: Int) {
|
||||
storageGetFilePreview(bucketId: $bucketId, fileId: $fileId, width: $width, height: $height) {
|
||||
status
|
||||
}
|
||||
}';
|
||||
|
||||
@@ -200,7 +200,7 @@ class StorageClientTest extends Scope
|
||||
'x-appwrite-project' => $projectId,
|
||||
], $this->getHeaders()), $gqlPayload);
|
||||
|
||||
$this->assertEquals(46719, \strlen($file['body']));
|
||||
$this->assertFilePreviewResponse($file);
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ class StorageServerTest extends Scope
|
||||
'x-appwrite-project' => $projectId,
|
||||
], $this->getHeaders()), $gqlPayload);
|
||||
|
||||
$this->assertEquals(46719, \strlen($file['body']));
|
||||
$this->assertFilePreviewResponse($file);
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user