-
Notifications
You must be signed in to change notification settings - Fork 25k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(build): Use Angular's testability API to wait for end of e2e tests #3911
Conversation
c230734
to
b060532
Compare
var result = _get.apply(this, arguments); | ||
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; | ||
// Benchmarks never need to wait for Angular 2 to be ready |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this? Benchmarks also contain regular Ng2 applications...
@Mlaval ping? |
b23e967
to
ec05ecf
Compare
@@ -11,7 +11,8 @@ describe('ng2 static tree benchmark', function() { | |||
url: URL, | |||
buttons: ['#ng2DestroyDom', '#ng2CreateDom'], | |||
id: 'ng2.static.tree.create.viewcache', | |||
params: [{name: 'viewcache', value: 'true'}] | |||
params: [{name: 'viewcache', value: 'true'}], | |||
waitForAngular2: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this the default (waitForAngular2=true
) and then not specify it in every benchmark configuration?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
ec05ecf
to
b724f36
Compare
Merging PR #3911 on behalf of @tbosch to branch presubmit-tbosch-pr-3911. |
FYI - we'll be moving some of this logic in to Protractor in the next release. Leaving myself a note to make sure to modify what needs to be updated here. |
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Fixes #3829
Some comments:
.get()
from webdriver instead of the patched one from Protractor.Testability
API is not available for web workers cases, so they are managed as if no waiting was needed