From 8d11f16e12ddf3a4633be102fb624722e8ecda3f Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 1 Aug 2021 13:15:06 +0300
Subject: [PATCH] Fixed tests

---
 .../Projects/ProjectsConsoleClientTest.php    | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index d8e8be5c8..ae83bd103 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -545,13 +545,15 @@ class ProjectsConsoleClientTest extends Scope
             if(!$service['optional']) {
                 continue;
             }
+
+            $key = $service['key'] ?? '';
             
             $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$id.'/service', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
             ]), [
-                'service' => $service,
+                'service' => $key,
                 'status' => false,
             ]);
 
@@ -566,7 +568,7 @@ class ProjectsConsoleClientTest extends Scope
 
             $this->assertEquals(200, $response['headers']['status-code']);
             $this->assertNotEmpty($response['body']['$id']);
-            $this->assertEquals(false, $response['body']['serviceStatusFor'.ucfirst($service)]);
+            $this->assertEquals(false, $response['body']['serviceStatusFor'.ucfirst($key)]);
         }
         
         /**
@@ -585,11 +587,17 @@ class ProjectsConsoleClientTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         foreach ($services as $service) {
+            if(!$service['optional']) {
+                continue;
+            }
+
+            $key = $service['key'] ?? '';
+
             $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$id.'/service/', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
-                'service' => $service,
+                'service' => $key,
                 'status' => true,
             ]);
         }
@@ -602,18 +610,24 @@ class ProjectsConsoleClientTest extends Scope
     {
         $id = $data['projectId'];
 
-        $services = ['functions', 'webhooks', 'avatars', 'health', 'locale', 'storage', 'teams'];
+        $services = require('app/config/services.php');
 
         /**
          * Test for Disabled
          */
         foreach ($services as $service) {
+            if(!$service['optional']) {
+                continue;
+            }
+
+            $key = $service['key'] ?? '';
+
             $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$id.'/service', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
             ]), [
-                'service' => $service,
+                'service' => $key,
                 'status' => false,
             ]);
 
@@ -628,7 +642,7 @@ class ProjectsConsoleClientTest extends Scope
 
             $this->assertEquals(200, $response['headers']['status-code']);
             $this->assertNotEmpty($response['body']['$id']);
-            $this->assertEquals(false, $response['body']['serviceStatusFor'.ucfirst($service)]);
+            $this->assertEquals(false, $response['body']['serviceStatusFor'.ucfirst($key)]);
         }
 
         /**