Skip to content

Commit e8230cd

Browse files
author
martgil
committed
test: add test
1 parent e73150b commit e8230cd

File tree

3 files changed

+67
-0
lines changed

3 files changed

+67
-0
lines changed

extension/js/common/ui/passphrase-ui.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export const initPassphraseToggle = async (passphraseInputIds: string[], forceIn
2626
for (const id of passphraseInputIds) {
2727
const passphraseInput = $(`#${id}`);
2828
passphraseInput.addClass('toggled_passphrase');
29+
passphraseInput.attr('data-test', 'input-passphrase');
2930
if (show) {
3031
passphraseInput.after(`<label href="#" id="toggle_${id}" class="toggle_show_hide_pass_phrase" for="${id}">${buttonHide}</label>`); // xss-direct
3132
passphraseInput.attr('type', 'text');

test/source/tests/settings.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,36 @@ import { flowcryptCompatibilityAliasList } from '../mock/google/google-endpoints
3232

3333
export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => {
3434
if (testVariant !== 'CONSUMER-LIVE-GMAIL') {
35+
test(
36+
'settings - inform user when importing newer key version',
37+
testWithBrowser(async (t, browser) => {
38+
t.context.mockApi!.configProvider = new ConfigurationProvider({
39+
attester: {
40+
pubkeyLookup: {},
41+
},
42+
});
43+
const acct = '[email protected]';
44+
const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, acct);
45+
const key50yearExpiry = testConstants.keyWith50yearsExpiry;
46+
await SetupPageRecipe.manualEnter(settingsPage, '', {
47+
fixKey: true,
48+
key: {
49+
title: '',
50+
armored: key50yearExpiry,
51+
passphrase: 'passphrase',
52+
longid: '6B673BAB02EC3E43',
53+
},
54+
});
55+
await SettingsPageRecipe.toggleScreen(settingsPage, 'additional');
56+
const addKeyPopup = await SettingsPageRecipe.awaitNewPageFrame(settingsPage, '@action-open-add-key-page', ['add_key.htm']);
57+
await addKeyPopup.waitAndClick('@source-paste');
58+
const key80yearExpiry = testConstants.keyWith80yearsExpiry;
59+
await addKeyPopup.waitAndType('@input-armored-key', key80yearExpiry);
60+
await addKeyPopup.waitAndType('@input-passphrase', 'passphrase');
61+
const expectedInfoMsg = "The key you're trying to import is a newer version of one you already have, based on its expiry date";
62+
await addKeyPopup.waitAndRespondToModal('info', 'confirm', expectedInfoMsg);
63+
})
64+
);
3565
test(
3666
'settings - my own emails show as contacts',
3767
testWithBrowser(async (t, browser) => {

test/source/tests/tooling/consts.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,6 +2050,42 @@ UR98qQ186mnyAcpbCVs7suK/0v+OIDHbF4gxMpRZmljstuT7mK4o6obfYwbOAq0Z
20502050
LE0zUUI5Yvk=
20512051
=XL9F
20522052
-----END PGP PUBLIC KEY BLOCK-----`,
2053+
keyWith50yearsExpiry: `-----BEGIN PGP PRIVATE KEY BLOCK-----
2054+
Comment: passphrase is passphrase
2055+
2056+
lIYEZ9etehYJKwYBBAHaRw8BAQdAS3w39Z7POxljA2Pw82iHSxdw/LXR+FzOpNMA
2057+
v6Pzjuf+BwMCnms3a0yOh9L/bSD0R3dfzQAnyKtlY5wuT9GY30ne9Wi5OrodVPDL
2058+
mm9lwOoq4CZhT76FCZH+VqQ1/W4ag5eXGus53teE9f+DvFQuBdUDFLQkdGVzdCBr
2059+
ZXkgPGxvbmcudGltZXNwYW5AZXhhbXBsZS5jb20+iJkEExYKAEECGwMFCwkIBwIC
2060+
IgIGFQoJCAsCBBYCAwECHgcCF4AWIQS6AopPWvdAXlKLtolrZzurAuw+QwUCZ9et
2061+
qQUJXfwPLwAKCRBrZzurAuw+Q0mZAP4g+96pBZQK+x0GWeTPbctN95Iutex0RS+f
2062+
vVsMhTPvwQD/Ytlt25KLL5hUdw4RMDckK6l9G+RoQH6FyWPWpZmZuw+ciwRn1616
2063+
EgorBgEEAZdVAQUBAQdA9TVaPoFGzRGv3zmNNEDQDGONRo7Up3baDpux3rgvmnMD
2064+
AQgH/gcDAiP/VHZnfkp4/2ux2bb4OZ9GHtIWZ4ijNqBggR3HBX/T9y3JSCgxs1uc
2065+
LM0JL5XrwaGGDDokpEr+GBuFFuGw6LfV+bw4No2Xuv84SxAF1RCIfgQYFgoAJhYh
2066+
BLoCik9a90BeUou2iWtnO6sC7D5DBQJn1616AhsMBQmWYBgAAAoJEGtnO6sC7D5D
2067+
OkYA/1W6mbl/dAqt1j3kwFptypOiK48yLcXjIYpptpqi6Jy+AQCofaj8LPWXUZmK
2068+
dm7daVbBUy6YHWaePL/Si2pfPR1WDg==
2069+
=5V6v
2070+
-----END PGP PRIVATE KEY BLOCK-----`,
2071+
keyWith80yearsExpiry: `-----BEGIN PGP PRIVATE KEY BLOCK-----
2072+
Comment: passphrase is passphrase
2073+
2074+
lIYEZ9etehYJKwYBBAHaRw8BAQdAS3w39Z7POxljA2Pw82iHSxdw/LXR+FzOpNMA
2075+
v6Pzjuf+BwMCNigCZ9Hr0Ab/cwmxlbbT1PEXSJyu7oVhZlTFjKu0SAmKp9vxjv44
2076+
Ry5So0rGJ5WjChH6SAHGoU7embN4zO8gf7oezsYcS3l4pkx/SAdworQkdGVzdCBr
2077+
ZXkgPGxvbmcudGltZXNwYW5AZXhhbXBsZS5jb20+iJkEExYKAEEWIQS6AopPWvdA
2078+
XlKLtolrZzurAuw+QwUCZ9etegIbAwUJlmAYAAULCQgHAgIiAgYVCgkICwIEFgID
2079+
AQIeBwIXgAAKCRBrZzurAuw+Q61pAP9UJMO8zjug77uEtepzSTEe42DXD6DPiGzT
2080+
2zGfIsuZ3QEA2MfWfxxSylNOcenjDiyJdZXbQ9XBIOd6gnSYpPFi0g+ciwRn1616
2081+
EgorBgEEAZdVAQUBAQdA9TVaPoFGzRGv3zmNNEDQDGONRo7Up3baDpux3rgvmnMD
2082+
AQgH/gcDAuFWQ5cWpFMO/wxxJn+r1CbUruerHu0m/lNAI9zq5PQ++i5vfrufR34r
2083+
ENWg+7hKHItP0eN4dC+63pfKOHw9ugcCQNPOtudaLTC1s9gMu9iIfgQYFgoAJhYh
2084+
BLoCik9a90BeUou2iWtnO6sC7D5DBQJn1616AhsMBQmWYBgAAAoJEGtnO6sC7D5D
2085+
OkYA/1W6mbl/dAqt1j3kwFptypOiK48yLcXjIYpptpqi6Jy+AQCofaj8LPWXUZmK
2086+
dm7daVbBUy6YHWaePL/Si2pfPR1WDg==
2087+
=Tujf
2088+
-----END PGP PRIVATE KEY BLOCK-----`,
20532089
};
20542090

20552091
export const testKeyConstants = {

0 commit comments

Comments
 (0)