Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-14 19:38:04 +02:00
Code Issues Activity

Rename e2e env vars to E2E_URL, simplify URL detection

Browse Source 
Rename GITEA_TEST_SERVER_URL and GITEA_URL to E2E_URL for consistency
with E2E_USER and E2E_PASSWORD. Simplify the if/else in test-e2e.sh.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
silverwind 2026-02-15 11:58:47 +01:00
parent aa8b0ad87e
commit 83a448c498
No known key found for this signature in database
GPG Key ID: 2E62B41C93869443
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull-e2e-tests.yml vendored
View File

@ -51,5 +51,5 @@ jobs:
INSTALL_LOCK = true INSTALL_LOCK = true
EOF EOF
- run: ./gitea web & - run: ./gitea web &
- run: GITEA_URL=http://localhost:3000 make test-e2e - run: E2E_URL=http://localhost:3000 make test-e2e
timeout-minutes: 10 timeout-minutes: 10

2
playwright.config.ts
View File

@ -11,7 +11,7 @@ export default defineConfig({
timeout: env.CI ? 15000 : 5000, timeout: env.CI ? 15000 : 5000,
}, },
use: { use: {
baseURL: env.GITEA_TEST_SERVER_URL?.replace?.(/\/$/g, '') || 'http://localhost:3000', baseURL: env.E2E_URL?.replace?.(/\/$/g, '') || 'http://localhost:3000',
locale: 'en-US', locale: 'en-US',
trace: 'off', trace: 'off',
screenshot: 'off', screenshot: 'off',

27
tools/test-e2e.sh
View File

@ -1,15 +1,13 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
# Determine the Gitea server URL, either from GITEA_URL env var or from custom/conf/app.ini # Determine the Gitea server URL, either from E2E_URL env var or from custom/conf/app.ini
if [ -n "${GITEA_URL:-}" ]; then if [ -z "${E2E_URL:-}" ]; then
GITEA_TEST_SERVER_URL="$GITEA_URL"
else
INI_FILE="custom/conf/app.ini" INI_FILE="custom/conf/app.ini"
if [ ! -f "$INI_FILE" ]; then if [ ! -f "$INI_FILE" ]; then
echo "error: $INI_FILE not found and GITEA_URL not set" >&2 echo "error: $INI_FILE not found and E2E_URL not set" >&2
echo "Either start Gitea with a config or set GITEA_URL explicitly:" >&2 echo "Either start Gitea with a config or set E2E_URL explicitly:" >&2
echo " GITEA_URL=http://localhost:3000 make test-e2e" >&2 echo " E2E_URL=http://localhost:3000 make test-e2e" >&2
exit 1 exit 1
fi fi
ROOT_URL=$(sed -n 's/^ROOT_URL\s*=\s*//p' "$INI_FILE" | tr -d '[:space:]') ROOT_URL=$(sed -n 's/^ROOT_URL\s*=\s*//p' "$INI_FILE" | tr -d '[:space:]')
@ -17,20 +15,20 @@ else
echo "error: ROOT_URL not found in $INI_FILE" >&2 echo "error: ROOT_URL not found in $INI_FILE" >&2
exit 1 exit 1
fi fi
GITEA_TEST_SERVER_URL="$ROOT_URL" E2E_URL="$ROOT_URL"
fi fi
# Normalize URL: trim trailing slash to avoid double slashes when appending paths # Normalize URL: trim trailing slash to avoid double slashes when appending paths
GITEA_TEST_SERVER_URL="${GITEA_TEST_SERVER_URL%/}" E2E_URL="${E2E_URL%/}"
echo "Using Gitea server: $GITEA_TEST_SERVER_URL" echo "Using Gitea server: $E2E_URL"
# Verify server is reachable, retry for up to 2 minutes for slow startup # Verify server is reachable, retry for up to 2 minutes for slow startup
MAX_WAIT=120 MAX_WAIT=120
ELAPSED=0 ELAPSED=0
while ! curl -sf --max-time 5 "$GITEA_TEST_SERVER_URL" > /dev/null 2>&1; do while ! curl -sf --max-time 5 "$E2E_URL" > /dev/null 2>&1; do
if [ "$ELAPSED" -ge "$MAX_WAIT" ]; then if [ "$ELAPSED" -ge "$MAX_WAIT" ]; then
echo "error: Gitea server at $GITEA_TEST_SERVER_URL is not reachable after ${MAX_WAIT}s" >&2 echo "error: Gitea server at $E2E_URL is not reachable after ${MAX_WAIT}s" >&2
echo "Start Gitea first: ${EXECUTABLE:-./gitea}" >&2 echo "Start Gitea first: ${EXECUTABLE:-./gitea}" >&2
exit 1 exit 1
fi fi
@ -42,7 +40,7 @@ done
E2E_USER="e2e" E2E_USER="e2e"
E2E_EMAIL="e2e@test.gitea.io" E2E_EMAIL="e2e@test.gitea.io"
E2E_PASSWORD="password" E2E_PASSWORD="password"
if ! curl -sf --max-time 5 "$GITEA_TEST_SERVER_URL/api/v1/users/$E2E_USER" > /dev/null 2>&1; then if ! curl -sf --max-time 5 "$E2E_URL/api/v1/users/$E2E_USER" > /dev/null 2>&1; then
echo "Creating e2e test user..." echo "Creating e2e test user..."
if ${EXECUTABLE:-./gitea} admin user create --username "$E2E_USER" --email "$E2E_EMAIL" --password "$E2E_PASSWORD" --must-change-password=false 2>/dev/null; then if ${EXECUTABLE:-./gitea} admin user create --username "$E2E_USER" --email "$E2E_EMAIL" --password "$E2E_PASSWORD" --must-change-password=false 2>/dev/null; then
echo "User '$E2E_USER' created" echo "User '$E2E_USER' created"
@ -52,7 +50,8 @@ if ! curl -sf --max-time 5 "$GITEA_TEST_SERVER_URL/api/v1/users/$E2E_USER" > /de
fi fi
fi fi
export GITEA_TEST_SERVER_URL export E2E_URL
export E2E_USER export E2E_USER
export E2E_PASSWORD export E2E_PASSWORD
exec pnpm exec playwright test "$@" exec pnpm exec playwright test "$@"