Fix tests

tests/e2e/Client.php

@@ -160,35 +160,21 @@ class Client
      * @param array $params
      * @param array $headers
      * @param bool $decode
-     * @return array|string
+     * @return array
      * @throws Exception
      */
-    public function call(string $method, string $path = '', array $headers = [], array $params = [], bool $decode = true)
+    public function call(string $method, string $path = '', array $headers = [], array $params = [], bool $decode = true): array
     {
         $headers            = array_merge($this->headers, $headers);
         $ch                 = curl_init($this->endpoint . $path . (($method == self::METHOD_GET && !empty($params)) ? '?' . http_build_query($params) : ''));
         $responseHeaders    = [];
-        $responseStatus     = -1;
-        $responseType       = '';
-        $responseBody       = '';
 
-        switch ($headers['content-type']) {
+        $query = match ($headers['content-type']) {
-            case 'application/json':
+            'application/json' => json_encode($params),
-                $query = json_encode($params);
+            'multipart/form-data' => $this->flatten($params),
-                break;
+            'application/graphql' => $params[0],
-
+            default => http_build_query($params),
-            case 'multipart/form-data':
+        };
-                $query = $this->flatten($params);
-                break;
-
-            case 'application/graphql':
-                $query = $params[0];
-                break;
-
-            default:
-                $query = http_build_query($params);
-                break;
-        }
 
         foreach ($headers as $i => $header) {
             $headers[] = $i . ':' . $header;
@@ -220,7 +206,7 @@ class Client
             curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
         }
 
-        // Allow self signed certificates
+        // Allow self-signed certificates
         if ($this->selfSigned) {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@@ -230,22 +216,18 @@ class Client
         $responseType   = $responseHeaders['content-type'] ?? '';
         $responseStatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-        if ($decode) {
+        if ($decode && substr($responseType, 0, strpos($responseType, ';')) == 'application/json') {
-            switch (substr($responseType, 0, strpos($responseType, ';'))) {
+            $json = json_decode($responseBody, true);
-                case 'application/json':
-                    $json = json_decode($responseBody, true);
 
-                    if ($json === null) {
+            if ($json === null) {
-                        throw new Exception('Failed to parse response: ' . $responseBody);
+                throw new Exception('Failed to parse response: ' . $responseBody);
-                    }
-
-                    $responseBody = $json;
-                    $json = null;
-                    break;
             }
+
+            $responseBody = $json;
+            $json = null;
         }
 
-        if ((curl_errno($ch)/* || 200 != $responseStatus*/)) {
+        if ((curl_errno($ch))) {
             throw new Exception(curl_error($ch) . ' with status code ' . $responseStatus, $responseStatus);
         }
 
@@ -273,7 +255,7 @@ class Client
     {
         $cookies = [];
 
-        parse_str(strtr($cookie, array('&' => '%26', '+' => '%2B', ';' => '&')), $cookies);
+        parse_str(strtr($cookie, ['&' => '%26', '+' => '%2B', ';' => '&']), $cookies);
 
         return $cookies;
     }

tests/e2e/General/HTTPTest.php

@@ -12,6 +12,12 @@ class HTTPTest extends Scope
     use ProjectNone;
     use SideNone;
 
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->client->setEndpoint('http://localhost');
+    }
+
     public function testOptions()
     {
         /**
@@ -32,24 +38,6 @@ class HTTPTest extends Scope
         $this->assertEmpty($response['body']);
     }
 
-    public function testError()
-    {
-        /**
-         * Test for SUCCESS
-         */
-        $this->markTestIncomplete('This test needs to be updated for the new console.');
-        // $response = $this->client->call(Client::METHOD_GET, '/error', \array_merge([
-        //     'origin' => 'http://localhost',
-        //     'content-type' => 'application/json',
-        // ]), []);
-
-        // $this->assertEquals(404, $response['headers']['status-code']);
-        // $this->assertEquals('Not Found', $response['body']['message']);
-        // $this->assertEquals(Exception::GENERAL_ROUTE_NOT_FOUND, $response['body']['type']);
-        // $this->assertEquals(404, $response['body']['code']);
-        // $this->assertEquals('dev', $response['body']['version']);
-    }
-
     public function testHumans()
     {
         /**
@@ -57,7 +45,7 @@ class HTTPTest extends Scope
          */
         $response = $this->client->call(Client::METHOD_GET, '/humans.txt', \array_merge([
             'origin' => 'http://localhost',
-        ]), []);
+        ]));
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertStringContainsString('# humanstxt.org/', $response['body']);
@@ -70,7 +58,7 @@ class HTTPTest extends Scope
          */
         $response = $this->client->call(Client::METHOD_GET, '/robots.txt', \array_merge([
             'origin' => 'http://localhost',
-        ]), []);
+        ]));
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertStringContainsString('# robotstxt.org/', $response['body']);
@@ -87,7 +75,7 @@ class HTTPTest extends Scope
          */
         $response = $this->client->call(Client::METHOD_GET, '/.well-known/acme-challenge/8DdIKX257k6Dih5s_saeVMpTnjPJdKO5Ase0OCiJrIg', \array_merge([
             'origin' => 'http://localhost',
-        ]), []);
+        ]));
 
         $this->assertEquals(404, $response['headers']['status-code']);
         // 'Unknown path', but validation passed
@@ -97,9 +85,9 @@ class HTTPTest extends Scope
          */
         $response = $this->client->call(Client::METHOD_GET, '/.well-known/acme-challenge/../../../../../../../etc/passwd', \array_merge([
             'origin' => 'http://localhost',
-        ]), []);
+        ]));
 
-        $this->assertEquals(400, $response['headers']['status-code']);
+        $this->assertEquals(404, $response['headers']['status-code']);
 
         // Cleanup
         $this->client->setEndpoint($previousEndpoint);

tests/e2e/Scopes/Scope.php

@@ -17,10 +17,7 @@ abstract class Scope extends TestCase
     protected function setUp(): void
     {
         $this->client = new Client();
-
+        $this->client->setEndpoint($this->endpoint);
-        $this->client
-            ->setEndpoint($this->endpoint)
-        ;
     }
 
     protected function tearDown(): void
@@ -45,10 +42,10 @@ abstract class Scope extends TestCase
     {
         sleep(2);
 
-        $resquest = json_decode(file_get_contents('http://request-catcher:5000/__last_request__'), true);
+        $request = json_decode(file_get_contents('http://request-catcher:5000/__last_request__'), true);
-        $resquest['data'] = json_decode($resquest['data'], true);
+        $request['data'] = json_decode($request['data'], true);
 
-        return $resquest;
+        return $request;
     }
 
     /**

tests/e2e/Services/Databases/DatabasesBase.php

@@ -3053,7 +3053,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create collection
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']

tests/e2e/Services/Projects/ProjectsConsoleClientTest.php

@@ -814,11 +814,11 @@ class ProjectsConsoleClientTest extends Scope
 
         $this->assertEquals($response['headers']['status-code'], 501);
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/anonymous', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/anonymous', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $id,
-        ]), []);
+        ]));
 
         $this->assertEquals($response['headers']['status-code'], 501);
 
@@ -874,6 +874,19 @@ class ProjectsConsoleClientTest extends Scope
             'name' => $name,
         ]);
 
+        $email = uniqid() . 'user@localhost.test';
+
+        $response = $this->client->call(Client::METHOD_POST, '/account', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $id,
+        ]), [
+            'userId' => ID::unique(),
+            'email' => $email,
+            'password' => $password,
+            'name' => $name,
+        ]);
+
         $this->assertEquals($response['headers']['status-code'], 501);
 
         /**
@@ -889,6 +902,8 @@ class ProjectsConsoleClientTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertNotEmpty($response['body']['$id']);
 
+        $email = uniqid() . 'user@localhost.test';
+
         $response = $this->client->call(Client::METHOD_POST, '/account', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',