fix(build): Use Angular's testability API to wait for end of e2e tests

Closes #3911
2015-08-27 17:44:59 +02:00
parent 00a4b2e28f
commit 33593cf8a2
19 changed files with 102 additions and 41 deletions
--- a/modules/angular2/src/test_lib/perf_util.ts
+++ b/modules/angular2/src/test_lib/perf_util.ts
@ -24,7 +24,9 @@ export function runBenchmark(config) {
          });
        }
        var url = encodeURI(config.url + '?' + urlParams.join('&'));
-        return browser.get(url).then(function() {
+        var getter = config.waitForAngular2 !== false ? browser.get(url) :
+                                                        browser.driver.get(browser.baseUrl + url);
+        return getter.then(function() {
          return global['benchpressRunner'].sample({
            id: config.id,
            execute: config.work,