mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-07-21 02:20:12 +00:00
* fix(issue): prevent crash from orphan issueProviderId (#7135) The Jira image-headers effect in task-detail-panel subscribed to selectIssueProviderById without an error handler, so a task with an issueProviderId pointing at a deleted provider (e.g. after sync convergence where taskIdsToUnlink didn't cover all local tasks) propagated the selector throw to Zone.js as a crash dialog. Wrap the inner selector observable in catchError that logs and falls back to of(null); the downstream jiraCfg?.isEnabled guard handles the fallback. Also drop IssueLog.log(issueProviderKey, issueProvider) from the throwing variant of the selector: providers may carry credentials (host, token, apiKey) and IssueLog history is exportable. * fix(focus-mode): sync tray countdown with in-app timer during breaks Tray title was rebuilt from a cached currentFocusSessionTime that only refreshed when CURRENT_TASK_UPDATED fired. addTimeSpent is gated on an active current task, so during focus-mode breaks or task-less focus sessions the cache froze while the in-app timer kept ticking. Add the tick action to taskChangeElectron$ so the cache refreshes every second whenever the focus timer is running. Fixes #7278 * fix(ci): restore GitHub Actions SHA pins undone by0e9218bd68Commit0e9218bd68silently reverted PR #7212 (github-actions-minor group bump) along with its stated sync/client-id work. This restores the 15 workflow files to their pre-revert state. Actions restored to newer pinned SHAs: - actions/upload-artifact v7.0.0 -> v7.0.1 - step-security/harden-runner v2.16.1 -> v2.17.0 - softprops/action-gh-release v2.6.1 -> v3.0.0 - signpath/github-action-submit-signing-request v2.0 -> v2.1 - anthropics/claude-code-action v1.0.89 -> v1.0.93 - docker/build-push-action v7.0.0 -> v7.1.0 - easingthemes/ssh-deploy v5.1.1 -> v6.0.3 * fix: restore i18n, UI, and docs work undone by0e9218bd68Commit0e9218bd68silently reverted the following work alongside its stated sync/client-id changes. Files where later master commits (fec7b25f23, etc.) already re-applied the reverted work are intentionally left untouched. Restored: - #7232 docs/long-term-plans/location-based-reminders.md (513 lines) - #7199 Romanian i18n phase 3 (ro.json + ro-md.json, ~1168 lines) - #7049 Polish translation improvements - #7143 planner component styling (4 scss files) - #7211 add-task-bar preserve time estimate when typing title - #7208 task.reducer roll-up estimates for added subtasks - #6767 focus-mode pomodoro reset button - #7205 plugin-dev github-issue-provider TOKEN description - #7231 mobile-bottom-nav FAB fix -a4fe03272iOS keyboard accessory bar (global-theme + dialog-fullscreen-markdown) -309670db3ShortSyntaxEffects undefined guard -667a7986fDropbox PKCE auth comment/behavior * fix(electron): restore electron + e2e work undone by0e9218bd68Commit0e9218bd68silently reverted the following electron/e2e work. Files already re-fixed by later master commits are left as-is: - e2e/tests/sync/supersync-archive-conflict.spec.ts (de33234976+191d129ff3) Restored: -e8a3e156ebfix(electron): Linux autostart IDB backing-store recovery (re-adds electron/clear-stale-idb-locks.ts + start-app.ts wiring) -5ce78a5b63fix(electron): macOS Cmd+Q / Dock > Quit hang (setIsQuiting + before-quit delegate to close-handler) -46e0fa2d01fix(sync): FILE_SYNC_LIST_FILES IPC contract (electronAPI.d.ts + local-file-sync + preload + ipc-events) -ea1ef16307fix(android): session-only SAF permissions on OEM devices -8865dc0a50test(e2e): supersync parallel-worker stampede guard (SUPERSYNC_SERVER_HEALTHY env-var fallback + goto retry loop) -af7c7687e2test(e2e): block WS-triggered downloads in non-WS specs -265b44db5dtest(e2e): premature waitForURL on daily-summary (this is literally the fix the bad commit's message claimed to add) Conflict resolutions: - e2e/utils/supersync-helpers.ts: kept the refined getDoneTaskElement checks fromd64014d086(later thanc558bcab5e) while restoring the goto retry loop from8865dc0a50. - electron/start-app.ts: unioned imports (setIsQuiting + clearStaleLevelDbLocks from theirs, fs from ours). * fix(sync): restore sync-core work undone by0e9218bd68Commit0e9218bd68silently reverted parts of several sync fixes. Most sync-core reverts have already been re-addressed differently on master by later commits (1f5184f6e7,05cd875dd6,09f5ced2c9,7df43358ab,d9158d6adb,32dbc95ed9,8c3b08e016,f89fe1ebc3) — those files are intentionally left untouched to avoid reverting master's newer work. This PR restores only the pieces that are genuinely still missing: -e8a3e156ebfix(electron): IDB backing-store autoreload (in-app piece) operation-log-hydrator.service.ts + .spec.ts (the electron/clear- stale-idb-locks.ts piece was restored in the prior commit) Plus three low-risk documentation/cleanup restorations: - operation-sync.util.ts — add "Nextcloud" to isFileBasedProvider JSDoc - dropbox.ts — restore improved _getRedirectUri JSDoc (667a7986fb) - dialog-get-and-enter-auth-code.component.ts — restore isNativePlatform comment explaining why manual code entry flow is used (667a7986fb) - file-adapter.interface.ts — remove stray "// NEW" comment (46e0fa2d01) Intentionally NOT restored (master's newer work covers or supersedes): - sync-trigger.service.ts / sync.effects.ts (05cd875dd6) - sync-wrapper.service.ts (1f5184f6e7) - sync-errors.ts (1f5184f6e7re-added LegacySyncFormatDetectedError) - file-based-sync-adapter.service.ts + spec (1f5184f6e7+d9158d6adb) - file-based-sync.types.ts (1f5184f6e7) - operation-log.const.ts (32dbc95ed9bumped IDB_OPEN_RETRIES to 5) - dialog-sync-initial-cfg.component.ts (f89fe1ebc3)
172 lines
5.6 KiB
TypeScript
172 lines
5.6 KiB
TypeScript
import { test as base } from '@playwright/test';
|
|
import {
|
|
isServerHealthy,
|
|
generateTestRunId,
|
|
type SimulatedE2EClient,
|
|
} from '../utils/supersync-helpers';
|
|
|
|
/**
|
|
* Extended test fixture for SuperSync E2E tests.
|
|
*
|
|
* Provides:
|
|
* - Automatic server health check (skips tests if server unavailable)
|
|
* - Unique testRunId per test for data isolation
|
|
* - Client tracking for automatic cleanup
|
|
*
|
|
* IMPORTANT: SuperSync tests create multiple browser contexts per test (2-3 clients).
|
|
* Running with too many workers (e.g., 12) can overwhelm the Angular dev server,
|
|
* causing ERR_CONNECTION_REFUSED errors. Recommended: --workers=3 or use the
|
|
* npm run e2e:supersync script which limits workers appropriately.
|
|
*
|
|
* Usage:
|
|
* ```typescript
|
|
* import { test, expect } from '../../fixtures/supersync.fixture';
|
|
*
|
|
* test.describe('@supersync My Tests', () => {
|
|
* test('should sync', async ({ browser, baseURL, testRunId }) => {
|
|
* // testRunId is automatically generated and unique per test
|
|
* });
|
|
* });
|
|
* ```
|
|
*/
|
|
|
|
export interface SuperSyncFixtures {
|
|
/** Unique test run ID for data isolation (e.g., "1704067200000-0") */
|
|
testRunId: string;
|
|
/** Whether the SuperSync server is healthy and available */
|
|
serverHealthy: boolean;
|
|
}
|
|
|
|
// Cache server health check result per worker to avoid repeated checks
|
|
let serverHealthyCache: boolean | null = null;
|
|
|
|
export const test = base.extend<SuperSyncFixtures>({
|
|
/**
|
|
* Generate a unique test run ID for this test.
|
|
* Used to isolate test data between parallel test runs.
|
|
* Also checks server health and skips test if server unavailable.
|
|
*/
|
|
testRunId: async ({}, use, testInfo) => {
|
|
// Check server health once per worker.
|
|
// Prefer the result pre-computed in globalSetup (stored as an env var before workers
|
|
// were forked) to avoid a stampede of concurrent HTTP requests from all workers
|
|
// simultaneously — which can overload the server and produce false negatives.
|
|
if (serverHealthyCache === null) {
|
|
if (process.env.SUPERSYNC_SERVER_HEALTHY !== undefined) {
|
|
serverHealthyCache = process.env.SUPERSYNC_SERVER_HEALTHY === 'true';
|
|
} else {
|
|
// Fallback for when tests are run directly without going through globalSetup
|
|
// (e.g., `npx playwright test --config ... e2e/tests/sync/foo.spec.ts`)
|
|
serverHealthyCache = await isServerHealthy();
|
|
}
|
|
if (!serverHealthyCache) {
|
|
console.warn(
|
|
'SuperSync server not healthy at http://localhost:1901 - skipping tests',
|
|
);
|
|
}
|
|
}
|
|
|
|
// Skip if server not healthy
|
|
testInfo.skip(!serverHealthyCache, 'SuperSync server not running');
|
|
|
|
const id = generateTestRunId(testInfo.workerIndex);
|
|
await use(id);
|
|
},
|
|
|
|
/**
|
|
* Check server health once per worker and cache the result.
|
|
* Tests are automatically skipped if the server is not healthy.
|
|
*/
|
|
serverHealthy: async ({}, use, testInfo) => {
|
|
// Only check once per worker — use globalSetup env var if available (see testRunId above)
|
|
if (serverHealthyCache === null) {
|
|
if (process.env.SUPERSYNC_SERVER_HEALTHY !== undefined) {
|
|
serverHealthyCache = process.env.SUPERSYNC_SERVER_HEALTHY === 'true';
|
|
} else {
|
|
serverHealthyCache = await isServerHealthy();
|
|
}
|
|
if (!serverHealthyCache) {
|
|
console.warn(
|
|
'SuperSync server not healthy at http://localhost:1901 - skipping tests',
|
|
);
|
|
}
|
|
}
|
|
|
|
// Skip the test if server is not healthy
|
|
testInfo.skip(!serverHealthyCache, 'SuperSync server not running');
|
|
|
|
await use(serverHealthyCache);
|
|
},
|
|
});
|
|
|
|
/**
|
|
* Helper to create a describe block that auto-checks server health.
|
|
* Use this instead of manually adding beforeEach health checks.
|
|
*
|
|
* @param title - Test suite title (will be prefixed with @supersync)
|
|
* @param fn - Test suite function
|
|
*
|
|
* @example
|
|
* ```typescript
|
|
* supersyncDescribe('Basic Sync', () => {
|
|
* test('should create and sync task', async ({ browser, baseURL, testRunId }) => {
|
|
* // Server health already checked, testRunId ready
|
|
* });
|
|
* });
|
|
* ```
|
|
*/
|
|
export const supersyncDescribe = (title: string, fn: () => void): void => {
|
|
test.describe(`@supersync ${title}`, () => {
|
|
// The serverHealthy fixture will auto-skip if server unavailable
|
|
test.beforeEach(async ({ serverHealthy }) => {
|
|
// This line ensures the fixture is evaluated and test is skipped if needed
|
|
void serverHealthy;
|
|
});
|
|
fn();
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Track clients for automatic cleanup in afterEach.
|
|
* Use with `trackClient` and `cleanupTrackedClients`.
|
|
*/
|
|
const trackedClients = new Map<string, SimulatedE2EClient[]>();
|
|
|
|
/**
|
|
* Track a client for automatic cleanup.
|
|
* Call this when creating clients so they're cleaned up even if the test fails.
|
|
*
|
|
* @param testId - A unique ID for this test (use testInfo.testId)
|
|
* @param client - The client to track
|
|
*/
|
|
export const trackClient = (testId: string, client: SimulatedE2EClient): void => {
|
|
if (!trackedClients.has(testId)) {
|
|
trackedClients.set(testId, []);
|
|
}
|
|
trackedClients.get(testId)!.push(client);
|
|
};
|
|
|
|
/**
|
|
* Clean up all tracked clients for a test.
|
|
* Call this in afterEach or finally blocks.
|
|
*
|
|
* @param testId - The test ID used when tracking clients
|
|
*/
|
|
export const cleanupTrackedClients = async (testId: string): Promise<void> => {
|
|
const clients = trackedClients.get(testId);
|
|
if (clients) {
|
|
for (const client of clients) {
|
|
try {
|
|
if (!client.page.isClosed()) {
|
|
await client.context.close();
|
|
}
|
|
} catch {
|
|
// Ignore cleanup errors
|
|
}
|
|
}
|
|
trackedClients.delete(testId);
|
|
}
|
|
};
|
|
|
|
// Re-export expect for convenience
|
|
export { expect } from '@playwright/test';
|