fix(web_workers): make waitForElementText function more stable

jeffbcross · jeffbcross · commit f6a8d04c32f8 · 2016-02-25T14:28:20.000-08:00
diff --git a/modules/playground/e2e_test/web_workers/router/router_spec.ts b/modules/playground/e2e_test/web_workers/router/router_spec.ts
@@ -1,6 +1,12 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
 
 describe("WebWorker Router", () => {
+  beforeEach(() => {
+    // This test can't wait for Angular 2 as Testability is not available when using WebWorker
+    browser.ignoreSynchronization = true;
+    browser.get('/');
+  });
+
   afterEach(() => {
     verifyNoBrowserErrors();
     browser.ignoreSynchronization = false;
@@ -11,8 +17,6 @@ describe("WebWorker Router", () => {
   var baseUrl = "playground/src/web_workers/router/index.html";
 
   it("should route on click", () => {
-    // This test can't wait for Angular 2 as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
     browser.get(baseUrl);
 
     waitForElement(contentSelector);
@@ -23,39 +27,38 @@ describe("WebWorker Router", () => {
     aboutBtn.click();
     waitForUrl(/\/about/);
     waitForElement(contentSelector);
+    waitForElementText(contentSelector, "About");
     content = element(by.css(contentSelector));
-    waitForElementText(content, "About");
     expect(content.getText()).toEqual("About");
     expect(browser.getCurrentUrl()).toMatch(/\/about/);
 
     let contactBtn = element(by.css(navSelector + " .contact"));
     contactBtn.click();
     waitForUrl(/\/contact/);
     waitForElement(contentSelector);
+    waitForElementText(contentSelector, "Contact");
     content = element(by.css(contentSelector));
-    waitForElementText(content, "Contact");
     expect(content.getText()).toEqual("Contact");
     expect(browser.getCurrentUrl()).toMatch(/\/contact/);
   });
 
   it("should load the correct route from the URL", () => {
-    // This test can't wait for Angular 2 as Testability is not available when using WebWorker
-    browser.ignoreSynchronization = true;
     browser.get(baseUrl + "#/about");
 
     waitForElement(contentSelector);
+    waitForElementText(contentSelector, "About");
     let content = element(by.css(contentSelector));
-    waitForElementText(content, "About");
     expect(content.getText()).toEqual("About");
   });
 
   function waitForElement(selector: string): void {
     browser.wait(protractor.until.elementLocated(by.css(selector)), 15000);
   }
 
-  function waitForElementText(elem: protractor.ElementFinder, expected: string): void {
+  function waitForElementText(contentSelector: string, expected: string): void {
     browser.wait(() => {
       let deferred = protractor.promise.defer();
+      var elem = element(by.css(contentSelector));
       elem.getText().then((text) => { return deferred.fulfill(text === expected); });
       return deferred.promise;
     }, 5000);
