From 83ba2957bf7498050717ebc5e46c3b8f5b4d7b7e Mon Sep 17 00:00:00 2001 From: George Gevoian Date: Mon, 28 Feb 2022 11:43:51 -0800 Subject: [PATCH] (core) Update failing HomeIntro core test Summary: Core doesn't redirect to Cognito or our own sign-up page when clicking 'sign up' on the welcome screen. Instead, it redirects to the test login page. Test Plan: N/A (fixing test) Reviewers: paulfitz Reviewed By: paulfitz Differential Revision: https://phab.getgrist.com/D3298 --- app/server/lib/FlexServer.ts | 2 +- test/nbrowser/homeUtil.ts | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts index ee95f0d1..cbe5c774 100644 --- a/app/server/lib/FlexServer.ts +++ b/app/server/lib/FlexServer.ts @@ -915,7 +915,7 @@ export class FlexServer implements GristServer { res.send(`
-

A Very Creduluous Login Page

+

A Very Credulous Login Page

A minimal login screen to facilitate testing. I'll believe anything you tell me. diff --git a/test/nbrowser/homeUtil.ts b/test/nbrowser/homeUtil.ts index 3986c029..2d0369c9 100644 --- a/test/nbrowser/homeUtil.ts +++ b/test/nbrowser/homeUtil.ts @@ -266,6 +266,13 @@ export class HomeUtil { return /^https:\/\/login(-s)?\.getgrist\.com/.test(await this.driver.getCurrentUrl()); } + /** + * Returns whether we are currently on the test login page. + */ + public async isOnTestLoginPage() { + return await this.driver.findContent('h1', 'A Very Credulous Login Page'); + } + /** * Waits for browser to navigate to Cognito login page. */ @@ -281,11 +288,24 @@ export class HomeUtil { } /** - * Waits for browser to navigate to either the Cognito or Grist login page. + * Waits for browser to navigate to test login page. + */ + 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) { await this.driver.wait( - async () => await this.isOnLoginPage() || await this.isOnGristLoginPage(), + async () => { + return ( + await this.isOnLoginPage() || + await this.isOnGristLoginPage() || + await this.isOnTestLoginPage() + ); + }, waitMs ); }