Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #635 from subtleGradient/subtlegradient/fixes-webdriver-test

Browse Source 
fixes webdriver issues
This commit is contained in:
Thomas Aylott
2013-12-05 14:55:52 -08:00
parent d035268c41 2807202ee7
commit 55e3b64ff4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grunt/tasks/webdriver-jasmine.js
+3 -3
View File
@@ -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)
.waitFor(wd.asserters.jsCondition("window.postDataToURL.running <= 0"), 30e3, 500)
.eval("jasmine.getJSReport().passed");
}
test/index.html
+1 -1
View File
@@ -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);
for (var urls_index = -1, urls_length = urls.length; ++urls_index < urls_length;) {
document.write('<script src="' + urls[urls_index] + cacheBust + '"><\/script>');