Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-22 00:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback

Browse source
This commit is contained in:
shimon 2023-08-21 10:37:44 +03:00
commit 2b62149dda
5 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Appwrite/Utopia/Response/Filters/V14.php
View file

@ -23,7 +23,7 @@ class V14 extends Filter
break;
case Response::MODEL_DOCUMENT:
// case Response::MODEL_DOMAIN:
case Response::MODEL_DOMAIN:
case Response::MODEL_FUNCTION:
case Response::MODEL_TEAM:
case Response::MODEL_MEMBERSHIP:
@ -38,10 +38,10 @@ class V14 extends Filter
$parsedResponse = $this->parseRemoveAttributesList($content, 'documents', ['$createdAt', '$updatedAt']);
break;
// case Response::MODEL_DOMAIN_LIST:
// $parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
case Response::MODEL_DOMAIN_LIST:
$parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
// break;
break;
case Response::MODEL_FUNCTION_LIST:
$parsedResponse = $this->parseRemoveAttributesList($content, 'functions', ['$createdAt', '$updatedAt']);

10
src/Appwrite/Utopia/Response/Filters/V15.php
View file

@ -50,7 +50,7 @@ class V15 extends Filter
break;
case Response::MODEL_DATABASE:
case Response::MODEL_DEPLOYMENT:
// case Response::MODEL_DOMAIN:
case Response::MODEL_DOMAIN:
case Response::MODEL_PLATFORM:
case Response::MODEL_PROJECT:
case Response::MODEL_TEAM:
@ -59,7 +59,7 @@ class V15 extends Filter
break;
case Response::MODEL_DATABASE_LIST:
case Response::MODEL_DEPLOYMENT_LIST:
// case Response::MODEL_DOMAIN_LIST:
case Response::MODEL_DOMAIN_LIST:
case Response::MODEL_PLATFORM_LIST:
case Response::MODEL_PROJECT_LIST:
case Response::MODEL_TEAM_LIST:
@ -72,9 +72,9 @@ class V15 extends Filter
case Response::MODEL_DEPLOYMENT_LIST:
$listKey = 'deployments';
break;
// case Response::MODEL_DOMAIN_LIST:
// $listKey = 'domains';
// break;
case Response::MODEL_DOMAIN_LIST:
$listKey = 'domains';
break;
case Response::MODEL_PLATFORM_LIST:
$listKey = 'platforms';
break;

4
tests/e2e/Services/Console/ConsoleConsoleClientTest.php
View file

@ -24,10 +24,12 @@ class ConsoleConsoleClientTest extends Scope
], $this->getHeaders()), []);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertCount(4, $response['body']);
$this->assertCount(6, $response['body']);
$this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
$this->assertIsInt($response['body']['_APP_STORAGE_LIMIT']);
$this->assertIsInt($response['body']['_APP_FUNCTIONS_SIZE_LIMIT']);
$this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
$this->assertIsString($response['body']['_APP_VCS_ENABLED']);
$this->assertIsString($response['body']['_APP_ASSISTANT_ENABLED']);
}
}

10
tests/e2e/Services/GraphQL/Base.php
View file

@ -1368,8 +1368,7 @@ trait Base
total
deployments {
_id
buildStdout
buildStderr
buildLogs
}
}
}';
@ -1378,8 +1377,7 @@ trait Base
functionsGetDeployment(functionId: $functionId, deploymentId: $deploymentId) {
_id
buildId
buildStdout
buildStderr
buildLogs
}
}';
case self::$CREATE_FUNCTION:
@ -1392,8 +1390,8 @@ trait Base
}
}';
case self::$UPDATE_FUNCTION:
return 'mutation updateFunction($functionId: String!, $name: String!, $execute: [String!]!, $events: [String], $schedule: String, $timeout: Int) {
functionsUpdate(functionId: $functionId, name: $name, execute: $execute, events: $events, schedule: $schedule, timeout: $timeout) {
return 'mutation updateFunction($functionId: String!, $name: String!, $execute: [String!]!, $runtime: String!, $entrypoint: String!, $events: [String], $schedule: String, $timeout: Int) {
functionsUpdate(functionId: $functionId, name: $name, execute: $execute, runtime: $runtime, entrypoint: $entrypoint, events: $events, schedule: $schedule, timeout: $timeout) {
_id
name
runtime

3
tests/e2e/Services/GraphQL/FunctionsServerTest.php
View file

@ -25,6 +25,7 @@ class FunctionsServerTest extends Scope
'variables' => [
'functionId' => ID::unique(),
'name' => 'Test Function',
'entrypoint' => 'index.php',
'runtime' => 'php-8.0',
'execute' => [Role::any()->toString()],
]
@ -381,6 +382,8 @@ class FunctionsServerTest extends Scope
'functionId' => $function['_id'],
'name' => 'Test Function Updated',
'execute' => [Role::any()->toString()],
'entrypoint' => 'index.php',
'runtime' => 'php-8.0',
'vars' => [
'name' => 'John Doe',
'age' => 42,