diff --git a/modules/examples/e2e_test/routing/routing_spec.ts b/modules/examples/e2e_test/routing/routing_spec.ts index 352d263dc3..821705af61 100644 --- a/modules/examples/e2e_test/routing/routing_spec.ts +++ b/modules/examples/e2e_test/routing/routing_spec.ts @@ -7,12 +7,6 @@ function waitForElement(selector) { browser.wait(EC.presenceOf($(selector)), 10000); } -// returns a promise that resolves in the given number of milliseconds -function wait(time) { - var promise = new Promise((resolve, reject) => { setTimeout(resolve, time); }); - return promise; -} - describe('routing inbox-app', function() { afterEach(verifyNoBrowserErrors); @@ -69,8 +63,9 @@ describe('routing inbox-app', function() { waitForElement('#item-10'); element(by.css('#item-10')).click(); waitForElement('#record-id'); - browser.wait(wait(500), 600); - expect(element(by.css('#record-id')).getText()).toEqual('ID: 10'); + var recordId = element(by.css("#record-id")); + browser.wait(protractor.until.elementTextIs(recordId, "ID: 10"), 5000); + expect(recordId.getText()).toEqual('ID: 10'); }); it('should navigate back to the email inbox page when the back button is clicked', function() { diff --git a/modules/examples/e2e_test/web_workers/web_workers_spec.ts b/modules/examples/e2e_test/web_workers/web_workers_spec.ts index c37d1b9d4d..7732baa745 100644 --- a/modules/examples/e2e_test/web_workers/web_workers_spec.ts +++ b/modules/examples/e2e_test/web_workers/web_workers_spec.ts @@ -1,12 +1,6 @@ import {verifyNoBrowserErrors} from 'angular2/src/test_lib/e2e_util'; import {Promise} from 'angular2/src/facade/async'; -// returns a promise that resolves in the given number of milliseconds -function wait(time) { - var promise = new Promise((resolve, reject) => { setTimeout(resolve, time); }); - return promise; -} - describe('WebWorkers', function() { afterEach(verifyNoBrowserErrors); var selector = "hello-app .greeting"; @@ -23,9 +17,10 @@ describe('WebWorkers', function() { browser.get(URL); browser.wait(protractor.until.elementLocated(by.css(selector)), 5000); - element.all(by.css(".changeButton")).first().click(); - browser.wait(wait(500), 600); - expect(element.all(by.css(selector)).first().getText()).toEqual("howdy world!"); + element(by.css("hello-app .changeButton")).click(); + var elem = element(by.css(selector)); + browser.wait(protractor.until.elementTextIs(elem, "howdy world!"), 5000); + expect(elem.getText()).toEqual("howdy world!"); }); it("should display correct key names", () => { @@ -34,9 +29,9 @@ describe('WebWorkers', function() { var area = element.all(by.css(".sample-area")).first(); expect(area.getText()).toEqual('(none)'); - browser.wait(wait(500), 600); area.sendKeys('u'); + browser.wait(protractor.until.elementTextIs(area, "U"), 5000); expect(area.getText()).toEqual("U"); }); });