Fix avatar tests

Author: Meldiron

docker-compose.yml

@@ -64,8 +64,10 @@ services:
     command: >
       -c "
         su git -c \"gitea admin user create --username $$GITEA_ADMIN_USERNAME --password $$GITEA_ADMIN_PASSWORD --email $$GITEA_ADMIN_EMAIL --admin --must-change-password=false\" || true &&
-        TOKEN=$$(su git -c \"gitea admin user generate-access-token --username $$GITEA_ADMIN_USERNAME --token-name $$GITEA_ADMIN_USERNAME-token --scopes all --raw\") &&
-        echo $$TOKEN > /data/gitea/token.txt
+        if [ ! -f /data/gitea/token.txt ]; then
+          TOKEN=$$(su git -c \"gitea admin user generate-access-token --username $$GITEA_ADMIN_USERNAME --token-name $$GITEA_ADMIN_USERNAME-token --scopes all --raw\") &&
+          echo $$TOKEN > /data/gitea/token.txt;
+        fi
       "
   request-catcher:                                                   
     image: appwrite/requestcatcher:1.1.0
@@ -107,8 +109,10 @@ services:
     command: >
       -c "
         su git -c \"forgejo admin user create --username $$FORGEJO_ADMIN_USERNAME --password $$FORGEJO_ADMIN_PASSWORD --email $$FORGEJO_ADMIN_EMAIL --admin --must-change-password=false\" || true &&
-        TOKEN=$$(su git -c \"forgejo admin user generate-access-token --username $$FORGEJO_ADMIN_USERNAME --token-name $$FORGEJO_ADMIN_USERNAME-token --scopes all --raw\") &&
-        echo $$TOKEN > /data/gitea/token.txt
+        if [ ! -f /data/gitea/token.txt ]; then
+          TOKEN=$$(su git -c \"forgejo admin user generate-access-token --username $$FORGEJO_ADMIN_USERNAME --token-name $$FORGEJO_ADMIN_USERNAME-token --scopes all --raw\") &&
+          echo $$TOKEN > /data/gitea/token.txt;
+        fi
       "
 
 volumes:

tests/VCS/Adapter/ForgejoTest.php

@@ -16,6 +16,7 @@ class ForgejoTest extends GiteaTest
 
     protected string $webhookEventHeader = 'X-Forgejo-Event';
     protected string $webhookSignatureHeader = 'X-Forgejo-Signature';
+    protected string $avatarDomain = 'http://localhost:3000/avatars/';
 
     protected function createVCSAdapter(): Git
     {

tests/VCS/Adapter/GiteaTest.php

@@ -16,6 +16,7 @@ class GiteaTest extends Base
 
     protected string $webhookEventHeader = 'X-Gitea-Event';
     protected string $webhookSignatureHeader = 'X-Gitea-Signature';
+    protected string $avatarDomain = 'gravatar.com';
 
     protected function createVCSAdapter(): Git
     {
@@ -749,7 +750,7 @@ public function testGetCommit(): void
         $this->assertSame($commitHash, $result['commitHash']);
         $this->assertSame('utopia', $result['commitAuthor']);
         $this->assertStringStartsWith($customMessage, $result['commitMessage']);
-        $this->assertStringContainsString('gravatar.com', $result['commitAuthorAvatar']);
+        $this->assertStringContainsString($this->avatarDomain, $result['commitAuthorAvatar']);
         $this->assertNotEmpty($result['commitUrl']);
 
         $this->vcsAdapter->deleteRepository(static::$owner, $repositoryName);
@@ -777,7 +778,7 @@ public function testGetLatestCommit(): void
         $this->assertNotEmpty($commit1['commitHash']);
         $this->assertSame('utopia', $commit1['commitAuthor']);
         $this->assertStringStartsWith($firstMessage, $commit1['commitMessage']);
-        $this->assertStringContainsString('gravatar.com', $commit1['commitAuthorAvatar']);
+        $this->assertStringContainsString($this->avatarDomain, $commit1['commitAuthorAvatar']);
         $this->assertNotEmpty($commit1['commitUrl']);
 
         $commit1Hash = $commit1['commitHash'];