Skip to content

Commit d716210

Browse files
committed
Update travis webdriver settings
1 parent be5d1f8 commit d716210

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

tests/selenium.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
var browser = wd.remote("localhost", 4445, process.env.SAUCE_USERNAME, process.env.SAUCE_ACCESS_KEY);
127127
var browserStream = new Bacon.Bus();
128128
test.capabilities["tunnel-identifier"] = process.env.TRAVIS_JOB_NUMBER;
129-
test.capabilities["name"] = process.env.TRAVIS_BUILD_NUMBER;
129+
test.capabilities["name"] = process.env.TRAVIS_COMMIT + " #" + process.env.TRAVIS_BUILD_NUMBER;
130130

131131
var resultStream = Bacon.fromNodeCallback(browser, "init", test.capabilities)
132132
.flatMap(Bacon.fromNodeCallback(browser, "setImplicitWaitTimeout", 15000)

tests/test.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@ var h2cSelector, h2cOptions;
1313
document.write(srcStart + '/tests/assets/jquery.plugin.html2canvas.js' + scrEnd);
1414
var html2canvas = ['log', 'nodecontainer', 'stackingcontext', 'textcontainer', 'support', 'imagecontainer', 'dummyimagecontainer', 'proxyimagecontainer', 'gradientcontainer', 'lineargradientcontainer', 'webkitgradientcontainer',
1515
'imageloader', 'nodeparser', 'font', 'fontmetrics', 'core', 'renderer', 'promise', 'renderers/canvas'], i;
16-
for (i = 0; i < html2canvas.length; ++i) {
17-
document.write(srcStart + '/src/' + html2canvas[i] + '.js?' + Math.random() + scrEnd);
16+
if (window.location.search === "?selenium") {
17+
document.write(srcStart + '/build/html2canvas.js' + scrEnd);
18+
} else {
19+
for (i = 0; i < html2canvas.length; ++i) {
20+
document.write(srcStart + '/src/' + html2canvas[i] + '.js?' + Math.random() + scrEnd);
21+
}
1822
}
23+
1924
window.onload = function() {
2025
h2cSelector = [document.documentElement];
2126

0 commit comments

Comments
 (0)