Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fix staging test that would timeout

Browse Source 
Summary:
Removes code from simulateLogin that's no longer needed, and increases
the timeout on the util function that checks if we're on the Grist sign-up
page.

Test Plan: N/A (fixing test)

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D3287
This commit is contained in:
George Gevoian 2022-02-23 14:41:00 -08:00
parent ac910389bc
commit 8f1889d2d7
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/nbrowser/homeUtil.ts
View File

@ -91,9 +91,6 @@ export class HomeUtil {
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);
} }
if (isFirstLogin === false) {
await this._fillWelcomePageIfPresent(name);
}
} }
if (options.freshAccount) { if (options.freshAccount) {
this._apiKey.delete(email); this._apiKey.delete(email);
@ -276,7 +273,7 @@ export class HomeUtil {
/** /**
* Waits for browser to navigate to Grist login page. * Waits for browser to navigate to Grist login page.
*/ */
public async checkGristLoginPage(waitMs: number = 2000) { public async checkGristLoginPage(waitMs: number = 4000) {
await this.driver.wait(this.isOnGristLoginPage.bind(this), waitMs); await this.driver.wait(this.isOnGristLoginPage.bind(this), waitMs);
} }
@ -335,20 +332,6 @@ export class HomeUtil {
} }
} }
// Get past the user welcome page if it is present.
private async _fillWelcomePageIfPresent(name?: string) {
// TODO: check treatment of welcome/team page when necessary.
if (await this.isWelcomePage()) {
if (name) {
await this.setValue(await this.driver.findWait('input[name="username"]', 4000), name);
}
const url = await this.driver.getCurrentUrl();
await this.driver.findWait('button.test-continue-button', 4000).click();
// Wait for the navigation to take place.
await this.driver.wait(async () => (await this.driver.getCurrentUrl()) !== url, 4000);
}
}
// Make a home api instance with the given api key, for the specified org. // Make a home api instance with the given api key, for the specified org.
// If no api key given, work anonymously. // If no api key given, work anonymously.
private _createHomeApiUsingApiKey(apiKey: string|null, org?: string): UserAPIImpl { private _createHomeApiUsingApiKey(apiKey: string|null, org?: string): UserAPIImpl {