Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update race condition with vault sync attempts in tests (#2439)
Leendert de Borst123263fd3a8e
diff --git a/apps/browser-extension/tests/e2e/05-vault-merge.spec.ts b/apps/browser-extension/tests/e2e/05-vault-merge.spec.tsindex ad64ae626..90af1f471 100644--- a/apps/browser-extension/tests/e2e/05-vault-merge.spec.ts+++ b/apps/browser-extension/tests/e2e/05-vault-merge.spec.ts@@ -54,7 +54,8 @@ test.describe.serial('5. Vault Merge', () => {.then((c) => c.screenshot('5.2-client-a-credential-saved.png')).then((c) => c.goToVault()).then((c) => c.verifyCredentialExists(credentialNameA))- .then((c) => c.screenshot('5.2-client-a-vault.png'));+ .then((c) => c.screenshot('5.2-client-a-vault.png'))+ .then((c) => c.waitForServerSync());});test('5.3 Client B should create a credential (triggers merge with Client A changes)', async () => {diff --git a/apps/browser-extension/tests/e2e/06-field-level-merge.spec.ts b/apps/browser-extension/tests/e2e/06-field-level-merge.spec.tsindex 631e69323..0d52d52c5 100644--- a/apps/browser-extension/tests/e2e/06-field-level-merge.spec.ts+++ b/apps/browser-extension/tests/e2e/06-field-level-merge.spec.ts@@ -44,7 +44,8 @@ test.describe.serial('6. Field-Level Merge', () => {await clientA.goToVault().then((c) => c.createCredential(credentialName, originalUsername, originalPassword))- .then((c) => c.screenshot('6.1-client-a-credential-created.png'));+ .then((c) => c.screenshot('6.1-client-a-credential-created.png'))+ .then((c) => c.waitForServerSync());});test('6.2 Both clients sync and verify credential exists', async () => {diff --git a/apps/browser-extension/tests/fixtures/TestClient.ts b/apps/browser-extension/tests/fixtures/TestClient.tsindex e88de88d1..f77daf75a 100644--- a/apps/browser-extension/tests/fixtures/TestClient.ts+++ b/apps/browser-extension/tests/fixtures/TestClient.ts@@ -210,6 +210,15 @@ export class TestClient {return this;}+ /**+ * Wait until the local changes are pushed to the server. A save only pushes in the background, so another+ * client syncing right after it can otherwise miss the change.+ */+ async waitForServerSync(timeout: number = Timeouts.LONG): Promise<this> {+ await expect.poll(() => this.popup.evaluate(async () => (await chrome.storage.local.get('isDirty')).isDirty === true), { timeout }).toBe(false);+ return this;+ }+/*** Open the add credential form via the item type dropdown in the header.*/