Split the E2E utils class into smaller files.

Author: crisbeto

e2e/components/dialog/dialog.e2e.ts

@@ -1,31 +1,31 @@
 import {browser, by, element, Key} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
+import {expectToExist, expectFocusOn} from '../../util/asserts';
+import {pressKeys, clickElementAtPoint} from '../../util/actions';
+import {waitForElement} from '../../util/query';
 
 describe('dialog', () => {
-  const utils = new E2EUtils();
-
   beforeEach(() => browser.get('/dialog'));
 
   it('should open a dialog', () => {
     element(by.id('default')).click();
-    utils.expectToExist('md-dialog-container');
+    expectToExist('md-dialog-container');
   });
 
   it('should close by clicking on the backdrop', () => {
     element(by.id('default')).click();
 
     waitForDialog().then(() => {
       clickOnBackrop();
-      utils.expectToExist('md-dialog-container', false);
+      expectToExist('md-dialog-container', false);
     });
   });
 
   it('should close by pressing escape', () => {
     element(by.id('default')).click();
 
     waitForDialog().then(() => {
-      utils.pressKeys(Key.ESCAPE);
-      utils.expectToExist('md-dialog-container', false);
+      pressKeys(Key.ESCAPE);
+      expectToExist('md-dialog-container', false);
     });
   });
 
@@ -34,15 +34,15 @@ describe('dialog', () => {
 
     waitForDialog().then(() => {
       element(by.id('close')).click();
-      utils.expectToExist('md-dialog-container', false);
+      expectToExist('md-dialog-container', false);
     });
   });
 
   it('should focus the first focusable element', () => {
     element(by.id('default')).click();
 
     waitForDialog().then(() => {
-      utils.expectFocusOn('md-dialog-container input');
+      expectFocusOn('md-dialog-container input');
     });
   });
 
@@ -53,7 +53,7 @@ describe('dialog', () => {
 
     waitForDialog().then(() => {
       clickOnBackrop();
-      utils.expectFocusOn(openButton);
+      expectFocusOn(openButton);
     });
   });
 
@@ -63,8 +63,8 @@ describe('dialog', () => {
     waitForDialog().then(() => {
       let tab = Key.TAB;
 
-      utils.pressKeys(tab, tab, tab);
-      utils.expectFocusOn('#close');
+      pressKeys(tab, tab, tab);
+      expectFocusOn('#close');
     });
   });
 
@@ -73,24 +73,24 @@ describe('dialog', () => {
 
     waitForDialog().then(() => {
       clickOnBackrop();
-      utils.expectToExist('md-dialog-container');
+      expectToExist('md-dialog-container');
     });
   });
 
   it('should be able to prevent closing by pressing escape', () => {
     element(by.id('disabled')).click();
 
     waitForDialog().then(() => {
-      utils.pressKeys(Key.ESCAPE);
-      utils.expectToExist('md-dialog-container');
+      pressKeys(Key.ESCAPE);
+      expectToExist('md-dialog-container');
     });
   });
 
   function waitForDialog() {
-    return utils.waitForElement('md-dialog-container');
+    return waitForElement('md-dialog-container');
   }
 
   function clickOnBackrop() {
-    utils.clickElementAtPoint('.cdk-overlay-backdrop', { x: 0, y: 0 });
+    clickElementAtPoint('.cdk-overlay-backdrop', { x: 0, y: 0 });
   }
 });

e2e/components/grid-list/grid-list.e2e.ts

@@ -1,16 +1,14 @@
 import {browser} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
+import {expectToExist} from '../../util/asserts';
 
 describe('grid-list', () => {
-  const utils = new E2EUtils();
-
   beforeEach(() => browser.get('/grid-list'));
 
   it('should render a grid list container', () => {
-    utils.expectToExist('md-grid-list');
+    expectToExist('md-grid-list');
   });
 
   it('should render list items inside the grid list container', () => {
-    utils.expectToExist('md-grid-list md-grid-tile');
+    expectToExist('md-grid-list md-grid-tile');
   });
 });

e2e/components/list/list.e2e.ts

@@ -1,16 +1,14 @@
 import {browser} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
+import {expectToExist} from '../../util/asserts';
 
 describe('list', () => {
-  const utils = new E2EUtils();
-
   beforeEach(() => browser.get('/list'));
 
   it('should render a list container', () => {
-    utils.expectToExist('md-list');
+    expectToExist('md-list');
   });
 
   it('should render list items inside the list container', () => {
-    utils.expectToExist('md-list md-list-item');
+    expectToExist('md-list md-list-item');
   });
 });

e2e/components/menu/menu.e2e.ts

@@ -1,26 +1,26 @@
 import {browser, Key, protractor} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
 import {MenuPage} from './menu-page';
+import {expectToExist, expectAlignedWith, expectFocusOn, expectLocation} from '../../util/asserts';
+import {pressKeys} from '../../util/actions';
 
 describe('menu', () => {
   const menuSelector = '.md-menu-panel';
-  const utils = new E2EUtils();
   let page: MenuPage;
 
   beforeEach(() => page = new MenuPage());
 
   it('should open menu when the trigger is clicked', () => {
-    utils.expectToExist(menuSelector, false);
+    expectToExist(menuSelector, false);
     page.trigger().click();
 
-    utils.expectToExist(menuSelector);
+    expectToExist(menuSelector);
     expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
   });
 
   it('should close menu when menu item is clicked', () => {
     page.trigger().click();
     page.items(0).click();
-    utils.expectToExist(menuSelector, false);
+    expectToExist(menuSelector, false);
   });
 
   it('should run click handlers on regular menu items', () => {
@@ -43,18 +43,18 @@ describe('menu', () => {
     page.triggerTwo().click();
 
     expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
-    utils.expectAlignedWith(page.menu(), '#trigger-two');
+    expectAlignedWith(page.menu(), '#trigger-two');
 
     page.backdrop().click();
-    utils.expectToExist(menuSelector, false);
+    expectToExist(menuSelector, false);
 
     page.trigger().click();
 
     expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
-    utils.expectAlignedWith(page.menu(), '#trigger');
+    expectAlignedWith(page.menu(), '#trigger');
 
     page.backdrop().click();
-    utils.expectToExist(menuSelector, false);
+    expectToExist(menuSelector, false);
   });
 
   it('should mirror classes on host to menu template in overlay', () => {
@@ -68,71 +68,71 @@ describe('menu', () => {
     beforeEach(() => {
       // click start button to avoid tabbing past navigation
       page.start().click();
-      utils.pressKeys(Key.TAB);
+      pressKeys(Key.TAB);
     });
 
     it('should auto-focus the first item when opened with ENTER', () => {
-      utils.pressKeys(Key.ENTER);
-      utils.expectFocusOn(page.items(0));
+      pressKeys(Key.ENTER);
+      expectFocusOn(page.items(0));
     });
 
     it('should auto-focus the first item when opened with SPACE', () => {
-      utils.pressKeys(Key.SPACE);
-      utils.expectFocusOn(page.items(0));
+      pressKeys(Key.SPACE);
+      expectFocusOn(page.items(0));
     });
 
     it('should not focus the first item when opened with mouse', () => {
       page.trigger().click();
-      utils.expectFocusOn(page.trigger());
+      expectFocusOn(page.trigger());
     });
 
     it('should focus subsequent items when down arrow is pressed', () => {
-      utils.pressKeys(Key.ENTER, Key.DOWN);
-      utils.expectFocusOn(page.items(1));
+      pressKeys(Key.ENTER, Key.DOWN);
+      expectFocusOn(page.items(1));
     });
 
     it('should focus previous items when up arrow is pressed', () => {
-      utils.pressKeys(Key.ENTER, Key.DOWN, Key.UP);
-      utils.expectFocusOn(page.items(0));
+      pressKeys(Key.ENTER, Key.DOWN, Key.UP);
+      expectFocusOn(page.items(0));
     });
 
     it('should skip disabled items using arrow keys', () => {
-      utils.pressKeys(Key.ENTER, Key.DOWN, Key.DOWN);
-      utils.expectFocusOn(page.items(3));
+      pressKeys(Key.ENTER, Key.DOWN, Key.DOWN);
+      expectFocusOn(page.items(3));
 
-      utils.pressKeys(Key.UP);
-      utils.expectFocusOn(page.items(1));
+      pressKeys(Key.UP);
+      expectFocusOn(page.items(1));
     });
 
     it('should close the menu when tabbing past items', () => {
-      utils.pressKeys(Key.ENTER, Key.TAB);
-      utils.expectToExist(menuSelector, false);
+      pressKeys(Key.ENTER, Key.TAB);
+      expectToExist(menuSelector, false);
 
-      utils.pressKeys(Key.TAB, Key.ENTER);
-      utils.expectToExist(menuSelector);
+      pressKeys(Key.TAB, Key.ENTER);
+      expectToExist(menuSelector);
 
-      utils.pressKeys(protractor.Key.chord(Key.SHIFT, Key.TAB));
-      utils.expectToExist(menuSelector, false);
+      pressKeys(protractor.Key.chord(Key.SHIFT, Key.TAB));
+      expectToExist(menuSelector, false);
     });
 
     it('should wrap back to menu when arrow keying past items', () => {
       let down = Key.DOWN;
-      utils.pressKeys(Key.ENTER, down, down, down);
-      utils.expectFocusOn(page.items(0));
+      pressKeys(Key.ENTER, down, down, down);
+      expectFocusOn(page.items(0));
 
-      utils.pressKeys(Key.UP);
-      utils.expectFocusOn(page.items(3));
+      pressKeys(Key.UP);
+      expectFocusOn(page.items(3));
     });
 
     it('should focus before and after trigger when tabbing past items', () => {
       let shiftTab = protractor.Key.chord(Key.SHIFT, Key.TAB);
 
-      utils.pressKeys(Key.ENTER, Key.TAB);
-      utils.expectFocusOn(page.triggerTwo());
+      pressKeys(Key.ENTER, Key.TAB);
+      expectFocusOn(page.triggerTwo());
 
       // navigate back to trigger
-      utils.pressKeys(shiftTab, Key.ENTER, shiftTab);
-      utils.expectFocusOn(page.start());
+      pressKeys(shiftTab, Key.ENTER, shiftTab);
+      expectFocusOn(page.start());
     });
 
   });
@@ -143,7 +143,7 @@ describe('menu', () => {
       page.trigger().click();
 
       // menu.x should equal trigger.x, menu.y should equal trigger.y
-      utils.expectAlignedWith(page.menu(), '#trigger');
+      expectAlignedWith(page.menu(), '#trigger');
     });
 
     it('should align overlay end to origin end when x-position is "before"', () => {
@@ -154,7 +154,7 @@ describe('menu', () => {
         // menu = 112px wide. trigger = 60px wide.  112 - 60 =  52px of menu to the left of trigger.
         // trigger.x (left corner) - 52px (menu left of trigger) = expected menu.x (left corner)
         // menu.y should equal trigger.y because only x position has changed.
-        utils.expectLocation(page.beforeMenu(), {x: trigger.x - 52, y: trigger.y});
+        expectLocation(page.beforeMenu(), {x: trigger.x - 52, y: trigger.y});
       });
     });
 
@@ -166,7 +166,7 @@ describe('menu', () => {
         // menu.x should equal trigger.x because only y position has changed.
         // menu = 64px high. trigger = 20px high. 64 - 20 = 44px of menu extending up past trigger.
         // trigger.y (top corner) - 44px (menu above trigger) = expected menu.y (top corner)
-        utils.expectLocation(page.aboveMenu(), {x: trigger.x, y: trigger.y - 44});
+        expectLocation(page.aboveMenu(), {x: trigger.x, y: trigger.y - 44});
       });
     });
 
@@ -176,7 +176,7 @@ describe('menu', () => {
 
         // trigger.x (left corner) - 52px (menu left of trigger) = expected menu.x
         // trigger.y (top corner) - 44px (menu above trigger) = expected menu.y
-        utils.expectLocation(page.combinedMenu(), {x: trigger.x - 52, y: trigger.y - 44});
+        expectLocation(page.combinedMenu(), {x: trigger.x - 52, y: trigger.y - 44});
       });
     });
 

e2e/components/progress-bar/progress-bar.e2e.ts

@@ -1,24 +1,22 @@
 import {browser} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
+import {expectToExist} from '../../util/asserts';
 
 describe('progress-bar', () => {
-  const utils = new E2EUtils();
-
   beforeEach(() => browser.get('/progress-bar'));
 
   it('should render a determinate progress bar', () => {
-    utils.expectToExist('md-progress-bar[mode="determinate"]');
+    expectToExist('md-progress-bar[mode="determinate"]');
   });
 
   it('should render a buffer progress bar', () => {
-    utils.expectToExist('md-progress-bar[mode="buffer"]');
+    expectToExist('md-progress-bar[mode="buffer"]');
   });
 
   it('should render a query progress bar', () => {
-    utils.expectToExist('md-progress-bar[mode="query"]');
+    expectToExist('md-progress-bar[mode="query"]');
   });
 
   it('should render a indeterminate progress bar', () => {
-    utils.expectToExist('md-progress-bar[mode="indeterminate"]');
+    expectToExist('md-progress-bar[mode="indeterminate"]');
   });
 });

e2e/components/slide-toggle/slide-toggle.e2e.ts

@@ -1,15 +1,14 @@
 import {browser, element, by, Key} from 'protractor';
-import {E2EUtils} from '../../utils.e2e';
+import {expectToExist} from '../../util/asserts';
 
 describe('slide-toggle', () => {
-  const utils = new E2EUtils();
   const getInput = () => element(by.css('#normal-slide-toggle input'));
   const getNormalToggle = () => element(by.css('#normal-slide-toggle'));
 
   beforeEach(() => browser.get('slide-toggle'));
 
   it('should render a slide-toggle', () => {
-    utils.expectToExist('md-slide-toggle');
+    expectToExist('md-slide-toggle');
   });
 
   it('should change the checked state on click', () => {