Compare commits

..

No commits in common. "7731eb11555fe120573f525c19ab649cf206da7b" and "ec122e86b8433757a60b10543db0d1b8a90097a5" have entirely different histories.

4 changed files with 9 additions and 21 deletions

View file

@ -28,23 +28,13 @@ tasks.register('coverage') {
} }
tasks.register('frontendE2E', Exec) { tasks.register('frontendE2E', Exec) {
group = 'verification' description = 'Run Playwright E2E tests in Docker (CI mode)'
description = 'Run Playwright E2E tests in Docker (same stack as Forgejo CI)' workingDir = file("${rootProject.projectDir}/frontend")
dependsOn frontendTest commandLine 'npm', 'run', 'test:e2e:ci'
workingDir = rootProject.projectDir
environment 'POSTGRES_DB', 'bilhej'
environment 'POSTGRES_USER', 'bilhej'
environment 'POSTGRES_PASSWORD', 'test_pw_ci_123'
environment 'JWT_SECRET', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
environment 'STRIPE_SECRET_KEY', 'sk_test_fake'
environment 'STRIPE_WEBHOOK_SECRET', 'whsec_fake'
environment 'STRIPE_PRICE_ID', 'price_fake'
commandLine 'docker', 'compose', '-f', 'docker-compose.e2e.yml',
'up', '--build', '--abort-on-container-exit', '--exit-code-from', 'playwright'
} }
tasks.named('check').configure { tasks.named('check').configure {
dependsOn frontendLint, frontendTest, frontendE2E dependsOn frontendLint, frontendTest
} }
tasks.register('up', Exec) { tasks.register('up', Exec) {

View file

@ -13,7 +13,7 @@
"test:watch": "vitest", "test:watch": "vitest",
"test:coverage": "vitest run --coverage", "test:coverage": "vitest run --coverage",
"test:e2e": "playwright test", "test:e2e": "playwright test",
"test:e2e:ci": "docker compose -f ../docker-compose.e2e.yml up --build --abort-on-container-exit --exit-code-from playwright" "test:e2e:ci": "docker compose -f ../docker-compose.ci.yml up --build --abort-on-container-exit --exit-code-from playwright"
}, },
"dependencies": { "dependencies": {
"pinia": "^3.0.4", "pinia": "^3.0.4",

View file

@ -13,9 +13,9 @@ const loading = ref(true)
const error = ref('') const error = ref('')
const statusError = ref('') const statusError = ref('')
const trackingError = ref('') const trackingError = ref('')
const activeFilter = ref< const activeFilter = ref<'all' | 'processing' | 'paid_group' | 'pending_payment'>(
'all' | 'processing' | 'paid_group' | 'pending_payment' 'all',
>('all') )
const searchQuery = ref('') const searchQuery = ref('')
const trackingInputValues = reactive<Record<string, string>>({}) const trackingInputValues = reactive<Record<string, string>>({})
const messageModalOrder = ref<AdminOrder | null>(null) const messageModalOrder = ref<AdminOrder | null>(null)

View file

@ -87,9 +87,7 @@ onMounted(async () => {
<div class="orders__card-meta"> <div class="orders__card-meta">
<span class="orders__meta-label">Beställnings-ID</span> <span class="orders__meta-label">Beställnings-ID</span>
<span class="orders__meta-value orders__order-id">{{ <span class="orders__meta-value orders__order-id">{{ order.id }}</span>
order.id
}}</span>
<span class="orders__meta-label">Meddelande</span> <span class="orders__meta-label">Meddelande</span>
<span class="orders__meta-value orders__message">{{ <span class="orders__meta-value orders__message">{{