From 28ef7da2318e3a27e5c1f410001eed645a80292c Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Mon, 17 Feb 2025 18:03:13 +0530 Subject: [PATCH] Fix new site tests --- .../Services/Functions/FunctionsCustomServerTest.php | 10 +++------- tests/e2e/Services/Sites/SitesCustomServerTest.php | 10 ++++------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 9ba474e4be..d3d7c0dc18 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -1717,9 +1717,7 @@ class FunctionsCustomServerTest extends Scope 'execute' => ['any'] ]); - $this->createFunctionDomain($functionId); - - $domain = $this->getFunctionDomain($functionId); + $domain = $this->createFunctionDomain($functionId); $this->setupDeployment($functionId, [ 'entrypoint' => 'index.php', @@ -1754,9 +1752,7 @@ class FunctionsCustomServerTest extends Scope 'execute' => ['any'] ]); - $this->createFunctionDomain($functionId); - - $domain = $this->getFunctionDomain($functionId); + $domain = $this->createFunctionDomain($functionId); $this->setupDeployment($functionId, [ 'entrypoint' => 'index.php', @@ -1876,7 +1872,7 @@ class FunctionsCustomServerTest extends Scope $functionId = $function['body']['$id'] ?? ''; - $this->createFunctionDomain($functionId); + $domain = $this->createFunctionDomain($functionId); $this->setupDeployment($functionId, [ 'code' => $this->packageFunction('node'), diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index c43d1937eb..723b49d5a2 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -79,9 +79,7 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($siteId); - $this->createSiteDomain($siteId, 'test-site'); - - $rule = $this->getSiteDomain($siteId); + $rule = $this->createSiteDomain($siteId, 'test-site'); $response = $this->client->call(Client::METHOD_GET, '/console/resources', [ 'origin' => 'http://localhost', @@ -1248,8 +1246,6 @@ class SitesCustomServerTest extends Scope }, 50000, 500); $domain = $this->createSiteDomain($siteId); - - $domain = $this->getSiteDomain($siteId); $proxyClient = new Client(); $proxyClient->setEndpoint('http://' . $domain); @@ -1400,6 +1396,8 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($siteId); + $domain = $this->createSiteDomain($siteId); + $deploymentId = $this->setupDeployment($siteId, [ 'code' => $this->packageSite('static'), 'activate' => 'true' @@ -1463,7 +1461,7 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($siteId); - $domain = $this->getSiteDomain($siteId); + $domain = $this->createSiteDomain($siteId, $subdomain); $this->assertNotEmpty($domain);