Merge pull request #9474 from appwrite/fix-sites-tests

Fix: site tests
This commit is contained in:
Matej Bačo 2025-03-08 23:57:59 +01:00 committed by GitHub
commit 4ff0b6283a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 9 deletions

12
composer.lock generated
View file

@ -3760,16 +3760,16 @@
},
{
"name": "utopia-php/detector",
"version": "0.1.0",
"version": "0.1.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/detector.git",
"reference": "ddeee9c3e702ae10b3eb53cafe5210a0c4896c94"
"reference": "5dcabbfcf99731f3a37d86b7cb1e93c968baf64b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/detector/zipball/ddeee9c3e702ae10b3eb53cafe5210a0c4896c94",
"reference": "ddeee9c3e702ae10b3eb53cafe5210a0c4896c94",
"url": "https://api.github.com/repos/utopia-php/detector/zipball/5dcabbfcf99731f3a37d86b7cb1e93c968baf64b",
"reference": "5dcabbfcf99731f3a37d86b7cb1e93c968baf64b",
"shasum": ""
},
"require": {
@ -3799,9 +3799,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/detector/issues",
"source": "https://github.com/utopia-php/detector/tree/0.1.0"
"source": "https://github.com/utopia-php/detector/tree/0.1.1"
},
"time": "2025-03-08T16:04:33+00:00"
"time": "2025-03-08T22:25:49+00:00"
},
{
"name": "utopia-php/domains",

View file

@ -962,7 +962,7 @@ services:
hostname: exc1
<<: *x-logging
stop_signal: SIGINT
image: openruntimes/executor:0.7.8
image: openruntimes/executor:0.7.9
restart: unless-stopped
networks:
- appwrite

View file

@ -689,9 +689,9 @@ class Builds extends Action
throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / 1048576, 2) . ' MBs.');
}
if ($resource->getCollection() === 'sites' && empty($resource->getAttribute('adapter'))) {
if ($resource->getCollection() === 'sites' && empty($resource->getAttribute('adapter', ''))) {
// TODO: Refactor with structured command in future, using utopia library (CLI)
$listFilesCommand = "cd /usr/local/build && cd " . \escapeshellarg($resource->getAttribute('outputDirectory')) . " && find . -name 'node_modules' -prune -o -type f -print";
$listFilesCommand = "cd /usr/local/build && cd " . \escapeshellarg($resource->getAttribute('outputDirectory', './')) . " && find . -name 'node_modules' -prune -o -type f -print";
$command = $executor->createCommand(
deploymentId: $deployment->getId(),
projectId: $project->getId(),

View file

@ -2068,6 +2068,14 @@ class SitesCustomServerTest extends Scope
$domain = $this->getDeploymentDomain($deploymentId);
$this->assertNotEmpty($domain);
// Create second deployment to make first one a preview
$deploymentId = $this->setupDeployment($siteId, [
'code' => $this->packageSite('static'),
'activate' => true
]);
$this->assertNotEmpty($deploymentId);
$proxyClient = new Client();
$proxyClient->setEndpoint('http://' . $domain);