Skip to content

Commit

Permalink
fix(build): make e2e tests faster
Browse files Browse the repository at this point in the history
Closes #3822
  • Loading branch information
marclaval committed Aug 25, 2015
1 parent 9cc1cd2 commit c2279dd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion modules/benchmarks/src/naive_infinite_scroll/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<button id="run-btn">Run</button>
<button id="reset-btn">Reset</button>
</div>
<scroll-app></scroll-app>
<scroll-app>Loading...</scroll-app>

$SCRIPTS$
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ describe('message bus', function() {

it('should receive a response from the worker', function() {
browser.get(URL);
browser.sleep(5000);

var VALUE = "hi there";
var input = element.all(by.css("#echo_input")).first();
Expand Down
2 changes: 1 addition & 1 deletion protractor-shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ function patchProtractorWait(browser) {
var sleepInterval = process.env.TRAVIS || process.env.JENKINS_URL ? 14000 : 8000;
browser.get = function() {
var result = _get.apply(this, arguments);
browser.sleep(sleepInterval);
browser.driver.wait(protractor.until.elementLocated(By.js('var cs = document.body.children; var isLoading = false; for (var i = 0; i < cs.length; i++) {if (cs[i].textContent.indexOf("Loading...") > -1) isLoading = true; } return !isLoading ? document.body.children : null')), sleepInterval);
return result;
}
}
Expand Down

0 comments on commit c2279dd

Please sign in to comment.