Skip to content

Commit c885088

Browse files
committed
fix: github actions tests runs
1 parent b45d332 commit c885088

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
postgres:
1616
image: postgres:16-alpine
1717
env:
18-
POSTGRES_USER: ackify
18+
POSTGRES_USER: postgres
1919
POSTGRES_PASSWORD: testpassword
2020
POSTGRES_DB: ackify_test
2121
options: >-
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Run database migrations
6464
env:
65-
ACKIFY_DB_DSN: "postgres://ackify:testpassword@localhost:5432/ackify_test?sslmode=disable"
65+
ACKIFY_DB_DSN: "postgres://postgres:testpassword@localhost:5432/ackify_test?sslmode=disable"
6666
run: |
6767
go run ./backend/cmd/migrate/main.go -migrations-path file://backend/migrations up
6868
@@ -77,14 +77,14 @@ jobs:
7777
7878
- name: Start Ackify server
7979
env:
80-
ACKIFY_DB_DSN: "postgres://ackify:testpassword@localhost:5432/ackify_test?sslmode=disable"
80+
ACKIFY_DB_DSN: "postgres://postgres:testpassword@localhost:5432/ackify_test?sslmode=disable"
8181
ACKIFY_BASE_URL: "http://localhost:8080"
8282
ACKIFY_ORGANISATION: "Ackify Test"
8383
ACKIFY_OAUTH_PROVIDER: "github"
8484
ACKIFY_OAUTH_CLIENT_ID: "test_client_id"
8585
ACKIFY_OAUTH_CLIENT_SECRET: "test_client_secret"
8686
ACKIFY_OAUTH_COOKIE_SECRET: "dGVzdF9jb29raWVfc2VjcmV0X2Zvcl90ZXN0aW5nXzEyMzQ1Njc4OTA="
87-
ACKIFY_ED25519_PRIVATE_KEY: "dGVzdF9wcml2YXRlX2tleV9mb3JfdGVzdGluZ19vbmx5XzEyMzQ1Njc4OTA="
87+
ACKIFY_ED25519_PRIVATE_KEY: "kKjNo0cTUOdXcamyxYCcmGfUm7zXzeI8T2jaLEjvbcpA0IIO7HbR3ANBlUlqlWuV3D+RjDT+8p5o37n98+Wu5A=="
8888
ACKIFY_LISTEN_ADDR: ":8080"
8989
ACKIFY_ADMIN_EMAILS: "admin@test.com"
9090
ACKIFY_MAIL_HOST: "localhost"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ RELEASE_*.md
77
.idea
88
.env
99
.env.local
10+
scripts/
1011

1112
.gocache/
1213
codecov.yml

backend/internal/infrastructure/auth/session_worker_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"context"
66
"errors"
77
"sync"
8+
"sync/atomic"
89
"testing"
910
"time"
1011

@@ -366,10 +367,10 @@ func TestSessionWorker_GracefulShutdown(t *testing.T) {
366367
}
367368

368369
func TestSessionWorker_ContextCancellation(t *testing.T) {
369-
cleanupCalled := false
370+
var cleanupCalled atomic.Bool
370371
repo := &mockSessionRepoForWorker{
371372
deleteExpiredFn: func(ctx context.Context, olderThan time.Duration) (int64, error) {
372-
cleanupCalled = true
373+
cleanupCalled.Store(true)
373374
// Check if context is cancelled during cleanup
374375
select {
375376
case <-ctx.Done():
@@ -395,7 +396,7 @@ func TestSessionWorker_ContextCancellation(t *testing.T) {
395396
// Wait for immediate cleanup
396397
time.Sleep(50 * time.Millisecond)
397398

398-
if !cleanupCalled {
399+
if !cleanupCalled.Load() {
399400
t.Error("Cleanup should have been called")
400401
}
401402

compose.e2e.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ services:
2525
ACKIFY_LOG_LEVEL: "debug"
2626
ACKIFY_LOG_FORMAT: "classic"
2727
ACKIFY_BASE_URL: "http://localhost:8080"
28-
ACKIFY_ORGANISATION: "Superkloud"
28+
ACKIFY_ORGANISATION: "Ackify Test"
2929
ACKIFY_DB_DSN: "postgres://postgres:testpassword@ackify-db:5432/ackify_test?sslmode=disable"
30-
ACKIFY_OAUTH_PROVIDER: "none"
31-
ACKIFY_OAUTH_COOKIE_SECRET: "Fk7eiBaG0sOhGn5+nWB6Ipl7TqbGfeLSdhwrEKjOPPM="
32-
ACKIFY_AUTH_OAUTH_ENABLED: "true"
33-
ACKIFY_AUTH_MAGICLINK_ENABLED: "true"
34-
ACKIFY_ED25519_PRIVATE_KEY: "1aK7vTp7hiqM9Z3Xbj7QDfPlYyWy740l9Fu+Fdom5ck="
30+
ACKIFY_OAUTH_PROVIDER: "github"
31+
ACKIFY_OAUTH_CLIENT_ID: "test_client_id"
32+
ACKIFY_OAUTH_CLIENT_SECRET: "test_client_secret"
33+
ACKIFY_OAUTH_COOKIE_SECRET: "dGVzdF9jb29raWVfc2VjcmV0X2Zvcl90ZXN0aW5nXzEyMzQ1Njc4OTA="
34+
ACKIFY_ED25519_PRIVATE_KEY: "kKjNo0cTUOdXcamyxYCcmGfUm7zXzeI8T2jaLEjvbcpA0IIO7HbR3ANBlUlqlWuV3D+RjDT+8p5o37n98+Wu5A=="
3535
ACKIFY_LISTEN_ADDR: ":8080"
36-
ACKIFY_ADMIN_EMAILS: "benjamin@kolapsis.com"
36+
ACKIFY_ADMIN_EMAILS: "admin@test.com"
3737
ACKIFY_MAIL_HOST: "mailhog"
3838
ACKIFY_MAIL_PORT: "1025"
3939
ACKIFY_MAIL_TLS: "false"
4040
ACKIFY_MAIL_STARTTLS: "false"
41-
ACKIFY_MAIL_FROM: "noreply@ackify.local"
42-
ACKIFY_MAIL_FROM_NAME: "Ackify"
41+
ACKIFY_MAIL_FROM: "noreply@ackify.test"
42+
ACKIFY_MAIL_FROM_NAME: "Ackify Test"
4343
depends_on:
4444
ackify-migrate:
4545
condition: service_completed_successfully

0 commit comments

Comments
 (0)