more refactoring

Author: goenning

lib/browser.ts

@@ -2,6 +2,8 @@ import 'chromedriver';
 import { Builder, ThenableWebDriver, WebElement, By, WebElementPromise } from 'selenium-webdriver';
 import { NewablePage, Page } from './page';
 
+export type WaitCondition = () => Promise<boolean>;
+
 export class Browser {
   private driver: ThenableWebDriver;
   public constructor(private browserName: string) {
@@ -16,19 +18,36 @@ export class Browser {
     return this.driver.findElement(By.css(selector));
   }
 
-  public async waitUntilIsVisible(locator: () => WebElementPromise): Promise<void> {
+  public async waitUntilAny(conditions: WaitCondition | WaitCondition[]): Promise<void> {
+    const all = (!(conditions instanceof Array)) ? [ conditions ] : conditions;
+
     await this.driver.wait(async () => {
-      try {
-        return await locator().isDisplayed();
-      } catch (ex) {
+        for (const condition of all) {
+          try {
+            return await condition();
+          } catch (ex) {
+            continue;
+          }
+        }
         return null;
-      }
     });
   }
 
-  public async waitForPage<T extends Page>(page: NewablePage<T>): Promise<void> {
+  public async waitUntilIsVisible(locator: () => WebElementPromise) {
+    await this.waitUntilAny(this.elementIsVisible(locator));
+  }
+
+  public async waitForPage<T extends Page>(page: NewablePage<T>) {
+    await this.waitUntilAny(this.pageHasLoaded(page));
+  }
+
+  public elementIsVisible(locator: () => WebElementPromise) {
+    return async () => await locator().isDisplayed();
+  }
+
+  public pageHasLoaded<T extends Page>(page: NewablePage<T>) {
     const thePage = new page(this);
-    await thePage.waitForLoad();
+    return thePage.loadCondition();
   }
 
   public async close(): Promise<void> {

lib/ensure.ts

@@ -14,6 +14,21 @@ class Ensurer {
     }
   }
 
+  public async isVisible() {
+    let displayed = false;
+    const selector = (this.element as any).selector;
+
+    try {
+      displayed = await this.element.isDisplayed();
+    } catch (ex) {
+      displayed = false;
+    }
+
+    if (!displayed) {
+      throw new Error(`Element ${this.selector} is not visible`);
+    }
+  }
+
   public async isNotVisible() {
     let displayed = false;
     const selector = (this.element as any).selector;

lib/page.ts

@@ -1,4 +1,4 @@
-import { Browser } from './browser';
+import { Browser, WaitCondition } from './browser';
 
 export interface NewablePage<T extends Page> {
   new(browser: Browser): T;
@@ -13,10 +13,10 @@ export abstract class Page {
 
   public async navigate(): Promise<void> {
     await this.browser.navigate(this.url);
-    await this.waitForLoad();
+    await this.browser.waitUntilAny(this.loadCondition());
   }
 
-  public abstract async waitForLoad(): Promise<void>;
+  public abstract loadCondition(): WaitCondition;
 
   public constructor(protected browser: Browser) {
 

pages/GoogleSignInPage.ts

@@ -19,6 +19,10 @@ export class GoogleSignInPage extends Page {
   @findBy('#passwordNext')
   public ConfirmPassword: WebElementPromise;
 
+  public loadCondition() {
+    return this.browser.elementIsVisible(() => this.Email);
+  }
+
   public async signInAsDarthVader() {
     return this.signInAs(config.users.darthvader.email, config.users.darthvader.password);
   }
@@ -31,8 +35,4 @@ export class GoogleSignInPage extends Page {
     await this.ConfirmPassword.click();
     await this.browser.waitForPage(HomePage);
   }
-
-  public async waitForLoad(): Promise<void> {
-    await this.browser.waitUntilIsVisible(() => this.Email);
-  }
 }

pages/HomePage.ts

@@ -23,8 +23,11 @@ export class HomePage extends Page {
   @findBy('.fdr-profile-popup .button.google')
   public GoogleSignIn: WebElementPromise;
 
-  public async waitForLoad(): Promise<void> {
-    await this.browser.waitUntilIsVisible(() => this.IdeaTitle);
+  @findBy('.ui.form .ui.negative.message')
+  public ErrorBox: WebElementPromise;
+
+  public loadCondition() {
+    return this.browser.elementIsVisible(() => this.IdeaTitle);
   }
 
   public async submitNewIdea(title: string, description: string): Promise<void> {
@@ -34,7 +37,7 @@ export class HomePage extends Page {
     await this.browser.waitForPage(ShowIdeaPage);
   }
 
-  public async clickAtSignInWithGoogle(): Promise<void> {
+  public async signInWithGoogle(): Promise<void> {
     await this.UserMenu.click();
     await this.browser.waitUntilIsVisible(() => this.GoogleSignIn);
     await this.GoogleSignIn.click();

pages/ShowIdeaPage.ts

@@ -14,7 +14,7 @@ export class ShowIdeaPage extends Page {
   @findBy('.support-counter .value')
   public SupportCounter: WebElementPromise;
 
-  public async waitForLoad(): Promise<void> {
-    await this.browser.waitUntilIsVisible(() => this.Title);
+  public loadCondition() {
+    return this.browser.elementIsVisible(() => this.Title);
   }
 }

specs/spec.ts

@@ -27,7 +27,7 @@ specification('Users can submit ideas', () => {
 
   when('user sign in', async () => {
     action(async () => {
-      await pages.home.clickAtSignInWithGoogle();
+      await pages.home.signInWithGoogle();
       await pages.google.signInAsDarthVader();
     });
 

tests/test.ts

@@ -9,7 +9,7 @@ describe('Submit ideas', () => {
     pages = new AllPages(new Browser('chrome'));
   });
 
-  it('TestCase #1: Unauthenticated cannot submit ideas', async () => {
+  it('Test Case #1: Unauthenticated cannot submit ideas', async () => {
     // Action
     await pages.home.navigate();
     await pages.home.IdeaTitle.sendKeys('Add support to TypeScript');
@@ -25,7 +25,7 @@ describe('Submit ideas', () => {
   it('Test Case #2: Authenticated can submit ideas', async () => {
     // Action
     await pages.home.navigate();
-    await pages.home.clickAtSignInWithGoogle();
+    await pages.home.signInWithGoogle();
     await pages.google.signInAsDarthVader();
 
     // Assert