-
Notifications
You must be signed in to change notification settings - Fork 45.6k
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
fixes webdriver issues #635
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,11 +73,11 @@ module.exports = function(){ | |
|
||
function getJSReport(browser){ | ||
return browser | ||
.waitForCondition("typeof window.jasmine != 'undefined'", 5e3) | ||
.waitFor(wd.asserters.jsCondition("typeof window.jasmine != 'undefined'"), 5e3, 50) | ||
.fail(function(error){ | ||
throw Error("The test page didn't load properly. " + error); | ||
}) | ||
.waitForCondition("typeof window.jasmine.getJSReport != 'undefined'", 10e3) | ||
.waitForCondition("window.postDataToURL.running <= 0", 30e3) | ||
.waitFor(wd.asserters.jsCondition("typeof window.jasmine.getJSReport != 'undefined'"), 60e3, 100) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 100ms because the tests can take a few seconds to run, but then I don't want to unnecessarily delay everything more than necessary. |
||
.waitFor(wd.asserters.jsCondition("window.postDataToURL.running <= 0"), 30e3, 500) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 500ms because if this isn't already 0 that means you're probably in debug mode and there are going to be a bunch of things to send. |
||
.eval("jasmine.getJSReport().passed"); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ | |
urls.unshift('../node_modules/es5-shim/es5-shim.js'); | ||
} | ||
|
||
var cacheBust = '?_=' + Date.now().toString(36); | ||
var cacheBust = '?_=' + (+new Date).toString(36); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is what polyfills are for? Or is the polyfill not loaded yet? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not loaded yet. |
||
|
||
for (var urls_index = -1, urls_length = urls.length; ++urls_index < urls_length;) { | ||
document.write('<script src="' + urls[urls_index] + cacheBust + '"><\/script>'); | ||
|
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.
what's the third argument here?
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.
poll interval
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.
what's the default? why set the other intervals differently?
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.
50ms because I want to start the tests asap