mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-27 20:44:07 +00:00
(core) Fill name on test login page when possible
Summary: Updates simulateLogin to fill in the name field of the test login page. Docker tests were failing because users created via the test login page were falling back to their email for their name. Test Plan: N/A (fixing Docker tests) Reviewers: paulfitz Reviewed By: paulfitz Differential Revision: https://phab.getgrist.com/D3315
This commit is contained in:
parent
c4d3d7d3bb
commit
7ead97b913
@ -77,7 +77,7 @@ export class HomeUtil {
|
|||||||
await this.driver.get('about:blank');
|
await this.driver.get('about:blank');
|
||||||
// When running against an external server, we log in through Cognito.
|
// When running against an external server, we log in through Cognito.
|
||||||
await this.driver.get(this.server.getUrl(org, ""));
|
await this.driver.get(this.server.getUrl(org, ""));
|
||||||
if (!(await this.isOnGristLoginPage()) && !(await this.isOnLoginPage())) {
|
if (!(await this.isOnSigninPage())) {
|
||||||
// Explicitly click sign-in link if necessary.
|
// Explicitly click sign-in link if necessary.
|
||||||
await this.driver.findWait('.test-user-signin', 4000).click();
|
await this.driver.findWait('.test-user-signin', 4000).click();
|
||||||
await this.driver.findContentWait('.grist-floating-menu a', 'Sign in', 500).click();
|
await this.driver.findContentWait('.grist-floating-menu a', 'Sign in', 500).click();
|
||||||
@ -86,10 +86,16 @@ export class HomeUtil {
|
|||||||
if (await this.isOnGristLoginPage()) {
|
if (await this.isOnGristLoginPage()) {
|
||||||
await this.driver.findWait('a[href*="login?"]', 4000).click();
|
await this.driver.findWait('a[href*="login?"]', 4000).click();
|
||||||
}
|
}
|
||||||
await this.checkLoginPage();
|
|
||||||
|
// Fill the login form (either on /test/login or Cognito).
|
||||||
|
if (await this.isOnTestLoginPage()) {
|
||||||
|
await this.fillTestLoginForm(email, name);
|
||||||
|
} else {
|
||||||
await this.fillLoginForm(email);
|
await this.fillLoginForm(email);
|
||||||
|
}
|
||||||
|
|
||||||
if (!(await this.isWelcomePage()) && (options.freshAccount || options.isFirstLogin)) {
|
if (!(await this.isWelcomePage()) && (options.freshAccount || options.isFirstLogin)) {
|
||||||
await this._recreateCurrentUser(email, org);
|
await this._recreateCurrentUser(email, org, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (options.freshAccount) {
|
if (options.freshAccount) {
|
||||||
@ -126,6 +132,22 @@ export class HomeUtil {
|
|||||||
return Boolean(url.match(/\/welcome\//));
|
return Boolean(url.match(/\/welcome\//));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fill the Grist test login page.
|
||||||
|
*
|
||||||
|
* TEST_ACCOUNT_PASSWORD must be set.
|
||||||
|
*/
|
||||||
|
public async fillTestLoginForm(email: string, name?: string) {
|
||||||
|
const password = process.env.TEST_ACCOUNT_PASSWORD;
|
||||||
|
if (!password) { throw new Error('TEST_ACCOUNT_PASSWORD not set'); }
|
||||||
|
|
||||||
|
const form = await this.driver.find('div.modal-content-desktop');
|
||||||
|
await this.setValue(form.find('input[name="username"]'), email);
|
||||||
|
if (name) { await this.setValue(form.find('input[name="name"]'), name); }
|
||||||
|
await this.setValue(form.find('input[name="password"]'), password);
|
||||||
|
await form.find('input[name="signInSubmitButton"]').click();
|
||||||
|
}
|
||||||
|
|
||||||
// Fill up a Cognito login page. If on a signup page, switch to a login page.
|
// Fill up a Cognito login page. If on a signup page, switch to a login page.
|
||||||
// TEST_ACCOUNT_PASSWORD must be set, or a password provided. Should be on a Cognito
|
// TEST_ACCOUNT_PASSWORD must be set, or a password provided. Should be on a Cognito
|
||||||
// login/signup page before calling this method.
|
// login/signup page before calling this method.
|
||||||
@ -270,60 +292,56 @@ export class HomeUtil {
|
|||||||
/**
|
/**
|
||||||
* Returns whether we are currently on the test login page.
|
* Returns whether we are currently on the test login page.
|
||||||
*/
|
*/
|
||||||
public async isOnTestLoginPage() {
|
public isOnTestLoginPage() {
|
||||||
return this.driver.findContent('h1', 'A Very Credulous Login Page').isPresent();
|
return this.driver.findContent('h1', 'A Very Credulous Login Page').isPresent();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Waits for browser to navigate to Cognito login page.
|
* Returns whether we are currently on any sign-in page (e.g. Cognito, Grist, test).
|
||||||
|
*/
|
||||||
|
public async isOnSigninPage() {
|
||||||
|
return await this.isOnLoginPage() || await this.isOnGristLoginPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Waits for browser to navigate to the Cognito login page.
|
||||||
*/
|
*/
|
||||||
public async checkLoginPage(waitMs: number = 2000) {
|
public async checkLoginPage(waitMs: number = 2000) {
|
||||||
await this.driver.wait(this.isOnLoginPage.bind(this), waitMs);
|
await this.driver.wait(this.isOnLoginPage.bind(this), waitMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Waits for browser to navigate to Grist login page.
|
* Waits for browser to navigate to a Grist login page.
|
||||||
*/
|
*/
|
||||||
public async checkGristLoginPage(waitMs: number = 2000) {
|
public async checkGristLoginPage(waitMs: number = 2000) {
|
||||||
await this.driver.wait(this.isOnGristLoginPage.bind(this), waitMs);
|
await this.driver.wait(this.isOnGristLoginPage.bind(this), waitMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Waits for browser to navigate to test login page.
|
* Waits for browser to navigate to any sign-in page (e.g. Cognito, Grist, test).
|
||||||
*/
|
|
||||||
public async checkTestLoginPage(waitMs: number = 2000) {
|
|
||||||
await this.driver.wait(this.isOnTestLoginPage.bind(this), waitMs);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Waits for browser to navigate to any login page (e.g. Cognito, Grist, test).
|
|
||||||
*/
|
*/
|
||||||
public async checkSigninPage(waitMs: number = 4000) {
|
public async checkSigninPage(waitMs: number = 4000) {
|
||||||
await this.driver.wait(
|
await this.driver.wait(this.isOnSigninPage.bind(this), waitMs);
|
||||||
async () => {
|
|
||||||
return (
|
|
||||||
await this.isOnLoginPage() ||
|
|
||||||
await this.isOnGristLoginPage() ||
|
|
||||||
await this.isOnTestLoginPage()
|
|
||||||
);
|
|
||||||
},
|
|
||||||
waitMs
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete and recreate the user, via the specified org. The specified user must be
|
* Delete and recreate the user, via the specified org. The specified user must be
|
||||||
* currently logged in!
|
* currently logged in!
|
||||||
*/
|
*/
|
||||||
private async _recreateCurrentUser(email: string, org: string) {
|
private async _recreateCurrentUser(email: string, org: string, name?: string) {
|
||||||
await this.deleteCurrentUser();
|
await this.deleteCurrentUser();
|
||||||
await this.removeLogin(org);
|
await this.removeLogin(org);
|
||||||
await this.driver.get(this.server.getUrl(org, ""));
|
await this.driver.get(this.server.getUrl(org, ""));
|
||||||
await this.driver.findWait('.test-user-signin', 4000).click();
|
await this.driver.findWait('.test-user-signin', 4000).click();
|
||||||
await this.driver.findContentWait('.grist-floating-menu a', 'Sign in', 500).click();
|
await this.driver.findContentWait('.grist-floating-menu a', 'Sign in', 500).click();
|
||||||
await this.checkLoginPage();
|
await this.checkLoginPage();
|
||||||
|
// Fill the login form (either on /test/login or Cognito).
|
||||||
|
if (await this.isOnTestLoginPage()) {
|
||||||
|
await this.fillTestLoginForm(email, name);
|
||||||
|
} else {
|
||||||
await this.fillLoginForm(email);
|
await this.fillLoginForm(email);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async _getApiKey(): Promise<string> {
|
private async _getApiKey(): Promise<string> {
|
||||||
return this.driver.wait(() => this.driver.executeAsyncScript<string>((done: (key: string) => void) => {
|
return this.driver.wait(() => this.driver.executeAsyncScript<string>((done: (key: string) => void) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user