mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-01-23 02:36:05 +00:00
3f3f0685eb
* master: (21 commits) test: increase timeout for encryption 16.8.3 fix(e2e): use pressSequentially for time input in task-detail tests fix(sync): resolve 25-second initial sync timeout race condition feat(e2e): add Docker-based E2E test isolation fix(schedule): start tracking selected task when pressing Y in schedule view fix(tasks): clear reminder when clicking "today" button on already-today tasks fix(e2e): use format-agnostic time change in task-detail tests 16.8.2 fix(test): reset selector overrides to prevent test pollution build: update CLAUDE.md fix(calendar): add periodic refresh for planner and scheduler views feat(effects): consolidate task update actions in PluginHooksEffects fix(sync): show skip button immediately when offline fix(db): add missing _afterReady guard to loadAll method feat(android): add alarm sound and vibration to task reminders feat(sync): add skip button to loading screen when waiting for sync fix(pomodoro): allow manual session end to start break early fix(i18n): add missing translate pipe to play button tooltip fix(tasks): handle undefined tasks in reminder effect ... # Conflicts: # CLAUDE.md # docker-compose.e2e.yaml # e2e/tests/task-detail/task-detail.spec.ts # package.json # src/app/features/tasks/store/task-reminder.effects.spec.ts # src/app/features/tasks/store/task-reminder.effects.ts # src/app/plugins/plugin-hooks.effects.ts
50 lines
1.1 KiB
YAML
50 lines
1.1 KiB
YAML
# Docker Compose override for E2E tests
|
|
# Uses port 1901 so tests can run while dev server uses 1900
|
|
services:
|
|
supersync:
|
|
ports: !override
|
|
- '1901:1900'
|
|
|
|
# Angular development server for E2E tests
|
|
app:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile.e2e.dev
|
|
ports:
|
|
- '${APP_PORT:-4242}:${APP_PORT:-4242}'
|
|
environment:
|
|
- APP_PORT=${APP_PORT:-4242}
|
|
healthcheck:
|
|
test: ['CMD', 'curl', '-sf', 'http://localhost:${APP_PORT:-4242}']
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 30
|
|
start_period: 120s
|
|
|
|
# WebDAV sync server (for sync tests)
|
|
webdav:
|
|
image: hacdias/webdav:latest
|
|
ports:
|
|
- '${WEBDAV_PORT:-2345}:${WEBDAV_PORT:-2345}'
|
|
environment:
|
|
- PORT=${WEBDAV_PORT:-2345}
|
|
volumes:
|
|
- ./webdav.yaml:/config.yml:ro
|
|
- webdav_data:/data
|
|
healthcheck:
|
|
test:
|
|
[
|
|
'CMD',
|
|
'wget',
|
|
'--quiet',
|
|
'--tries=1',
|
|
'--spider',
|
|
'http://localhost:${WEBDAV_PORT:-2345}/',
|
|
]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 10s
|
|
|
|
volumes:
|
|
webdav_data:
|