Skip to content

allow to test manualEnter with keyPath #3528 #3861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 3 commits into from
Jul 28, 2021
Merged

allow to test manualEnter with keyPath #3528 #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78b56db
allow to test manualEnter with keyPath #3528
rrrooommmaaa Jul 28, 2021
f712981
Added test
rrrooommmaaa Jul 28, 2021
88cce6f
tslint fix
rrrooommmaaa Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added test/samples/openpgp/flowcrypttestkeyimportedgmailcom-0x825B8AE8B14CFC0E.key
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions test/source/tests/page-recipe/setup-page-recipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ export class SetupPageRecipe extends PageRecipe {
await settingsPage.waitAndClick('@input-step2bmanualenter-source-paste', { retryErrs: true });
await settingsPage.waitAndType('@input-step2bmanualenter-ascii-key', key.armored);
} else if (key.filePath) { // inputted as a file
await settingsPage.waitAndClick('@input-step2bmanualenter-file', { retryErrs: true });
await Util.sleep(0.5);
const fileInput = await settingsPage.target.$('input[type=file]');
await fileInput!.uploadFile(key.filePath);
const [fileChooser] = await Promise.all([
settingsPage.page.waitForFileChooser(),
settingsPage.waitAndClick('@input-step2bmanualenter-file', { retryErrs: true })]);
await fileChooser.accept([key.filePath]);
await Util.sleep(1);
} else {
throw new Error('dont know how to import test key because missing both "armored" and "filePath"');
Expand Down
14 changes: 13 additions & 1 deletion test/source/tests/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ export const defineSetupTests = (testVariant: TestVariant, testWithBrowser: Test
{ isSavePassphraseChecked: false, isSavePassphraseDisabled: false });
}));

ava.default('setup - import unarmored key from file', testWithBrowser(undefined, async (t, browser) => {
const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'flowcrypt.test.key.imported@gmail.com');
const key = {
title: 'unarmored OpenPGP key',
filePath: 'test/samples/openpgp/flowcrypttestkeyimportedgmailcom-0x825B8AE8B14CFC0E.key',
armored: null, // tslint:disable-line:no-null-keyword
passphrase: 'will recognize i used pgp',
longid: null // tslint:disable-line:no-null-keyword
};
await SetupPageRecipe.manualEnter(settingsPage, key.title, { submitPubkey: false, usedPgpBefore: false, key });
}));

ava.default('setup - import key - submit - used before', testWithBrowser(undefined, async (t, browser) => {
const settingsPage = await BrowserRecipe.openSettingsLoginApprove(t, browser, 'flowcrypt.test.key.used.pgp@gmail.com');
await SetupPageRecipe.manualEnter(settingsPage, 'flowcrypt.test.key.used.pgp', { submitPubkey: true, usedPgpBefore: true },
Expand Down Expand Up @@ -444,7 +456,7 @@ AN8G3r5Htj8olot+jm9mIa5XLXWzMNUZgg==
await composeFrame.waitAndClick('@action-send');
await inboxPage.waitAll('@dialog-passphrase');
const passphraseDialog = await inboxPage.getFrame(['passphrase.htm']);
await passphraseDialog.waitForContent('@lost-pass-phrase-with-ekm','Ask your IT staff for help if you lost your pass phrase.');
await passphraseDialog.waitForContent('@lost-pass-phrase-with-ekm', 'Ask your IT staff for help if you lost your pass phrase.');
const forgetPassPhraseElement = await passphraseDialog.waitAny('@forget-pass-phrase');
expect(await InboxPageRecipe.isElementDisabled(forgetPassPhraseElement)).to.equal(true);
expect(await InboxPageRecipe.isElementChecked(forgetPassPhraseElement)).to.equal(true);
Expand Down