From a7ab6a343140eda1ee05144f2ff880b99e315990 Mon Sep 17 00:00:00 2001 From: martgil Date: Sun, 29 Dec 2024 20:06:36 +0800 Subject: [PATCH 1/4] Add negative test --- extension/chrome/settings/modules/my_key.htm | 4 +++- test/source/tests/flaky.ts | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extension/chrome/settings/modules/my_key.htm b/extension/chrome/settings/modules/my_key.htm index 2c5818a829d..1da60c7be2c 100644 --- a/extension/chrome/settings/modules/my_key.htm +++ b/extension/chrome/settings/modules/my_key.htm @@ -32,7 +32,9 @@        Save public key to a file - +
Key creation:
Key expiration:
diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts index 68a36d957ef..e5f1caf2896 100644 --- a/test/source/tests/flaky.ts +++ b/test/source/tests/flaky.ts @@ -245,6 +245,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test await SetupPageRecipe.createKey(settingsPage, 'unused', 'none', { selectKeyAlgo: 'rsa3072', key: { passphrase: 'long enough to suit requirements' }, + submitPubkey: false, }); await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); @@ -253,6 +254,8 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test t, `chrome/settings/modules/my_key.htm?placement=settings&parentTabId=60%3A0&acctEmail=${acctEmail}&fingerprint=${fingerprint}` ); + await myKeyFrame.waitAll(['@container-shareable-pubkey-link']); + expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.equal(false); const downloadedFiles = await myKeyFrame.awaitDownloadTriggeredByClicking('@action-download-prv'); // const longid = OpenPGPKey.fingerprintToLongid(fingerprint); const longid = fingerprint.substring(fingerprint.length - 16); From c58ad3a5e6c3ea2a1203919efafd65cad9e07094 Mon Sep 17 00:00:00 2001 From: martgil Date: Sun, 29 Dec 2024 20:15:55 +0800 Subject: [PATCH 2/4] add positive test --- test/source/tests/flaky.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts index e5f1caf2896..0bde08245fd 100644 --- a/test/source/tests/flaky.ts +++ b/test/source/tests/flaky.ts @@ -109,6 +109,14 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test { submitPubkey: true, usedPgpBefore: true }, { isSavePassphraseChecked: false, isSavePassphraseHidden: false } ); + await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); + const fingerprint = '4BD89F39E74396AE462B97EE825B8AE8B14CFC0E'; + const myKeyFrame = await browser.newPage( + t, + `chrome/settings/modules/my_key.htm?placement=settings&parentTabId=60%3A0&acctEmail=${acctEmail}&fingerprint=${fingerprint}` + ); + await myKeyFrame.waitAll(['@container-shareable-pubkey-link']); + expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.equal(true); }) ); From bbf79815153bbf4ce384cd31b435253a9216fba3 Mon Sep 17 00:00:00 2001 From: martgil Date: Mon, 30 Dec 2024 11:53:50 +0800 Subject: [PATCH 3/4] update positive test --- test/source/tests/flaky.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts index 0bde08245fd..461f8b7d1dc 100644 --- a/test/source/tests/flaky.ts +++ b/test/source/tests/flaky.ts @@ -110,13 +110,9 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test { isSavePassphraseChecked: false, isSavePassphraseHidden: false } ); await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); - const fingerprint = '4BD89F39E74396AE462B97EE825B8AE8B14CFC0E'; - const myKeyFrame = await browser.newPage( - t, - `chrome/settings/modules/my_key.htm?placement=settings&parentTabId=60%3A0&acctEmail=${acctEmail}&fingerprint=${fingerprint}` - ); - await myKeyFrame.waitAll(['@container-shareable-pubkey-link']); - expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.equal(true); + await settingsPage.waitAndClick('@action-open-pubkey-page'); + const myKeyFrame = await settingsPage.getFrame(['my_key.htm']); + expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.be.true; }) ); From 06d8afd29a12855128237d38b39927e89102a9c6 Mon Sep 17 00:00:00 2001 From: martgil Date: Mon, 30 Dec 2024 12:03:00 +0800 Subject: [PATCH 4/4] fix negative test --- test/source/tests/flaky.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts index 461f8b7d1dc..49c04459aaf 100644 --- a/test/source/tests/flaky.ts +++ b/test/source/tests/flaky.ts @@ -258,13 +258,11 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test t, `chrome/settings/modules/my_key.htm?placement=settings&parentTabId=60%3A0&acctEmail=${acctEmail}&fingerprint=${fingerprint}` ); - await myKeyFrame.waitAll(['@container-shareable-pubkey-link']); - expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.equal(false); + expect(await myKeyFrame.isElementPresent('@container-shareable-pubkey-link')).to.be.false; const downloadedFiles = await myKeyFrame.awaitDownloadTriggeredByClicking('@action-download-prv'); // const longid = OpenPGPKey.fingerprintToLongid(fingerprint); const longid = fingerprint.substring(fingerprint.length - 16); const fileName = `flowcrypt-backup-usernosubmitclientconfigurationflowcrypttest-0x${longid}.asc`; - const key = await KeyUtil.parse(downloadedFiles[fileName].toString()); expect(key.algo.bits).to.equal(3072); expect(key.algo.algorithm).to.equal('rsaEncryptSign');