From f9bc5d0cce1db4414f7c8c8c576609c6f49eebb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 21 Feb 2025 22:10:39 +0100
Subject: [PATCH] Fix tests

---
 app/controllers/general.php                    |  4 ++--
 tests/e2e/Services/Functions/FunctionsBase.php | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 564125c79e..6d201d4a78 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -270,11 +270,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         if ($type === 'function') {
             $jwtExpiry = $resource->getAttribute('timeout', 900);
             $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-            $apiKey = $jwtObj->encode([
+            $jwtKey = $jwtObj->encode([
                 'projectId' => $project->getId(),
                 'scopes' => $resource->getAttribute('scopes', [])
             ]);
-            $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
+            $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
             $headers['x-appwrite-trigger'] = 'http';
             $headers['x-appwrite-user-jwt'] = '';
         }
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index ce5df8b746..b7624c24a1 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -51,6 +51,18 @@ trait FunctionsBase
             $this->assertEquals('ready', $deployment['body']['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
         }, 50000, 500);
 
+        // Not === so multipart/form-data works fine too
+        if (($params['activate'] ?? false) == true) {
+            $this->assertEventually(function () use ($functionId, $deploymentId) {
+                $function = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId, array_merge([
+                    'content-type' => 'application/json',
+                    'x-appwrite-project' => $this->getProject()['$id'],
+                    'x-appwrite-key' => $this->getProject()['apiKey'],
+                ]));
+                $this->assertEquals($deploymentId, $function['body']['deployment'], 'Deployment is not activated, deployment: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
+            }, 100000, 500);
+        }
+
         return $deploymentId;
     }