mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix webdriver tests for node 4.0

Browse Source
This commit is contained in:
MoyuScript 2015-12-06 13:32:35 -05:00
parent 376f3563dc
commit 47b3b2a671
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -35,12 +35,15 @@
"html2canvas-proxy": "0.0.5", "html2canvas-proxy": "0.0.5",
"humanize-duration": "^2.0.1", "humanize-duration": "^2.0.1",
"lodash": "^3.10.1", "lodash": "^3.10.1",
"png-js": "^0.1.1", "pngjs": "^2.2.0",
"requirejs": "^2.1.20", "requirejs": "^2.1.20",
"sauce-connect-launcher": "^0.13.0",
"wd": "^0.4.0" "wd": "^0.4.0"
}, },
"scripts": { "scripts": {
"test": "grunt travis --verbose" "test": "grunt travis --verbose",
"start": "grunt server",
"sauceconnect": "tests/sauceconnect.js"
}, },
"homepage": "http://html2canvas.hertzen.com", "homepage": "http://html2canvas.hertzen.com",
"license": "MIT" "license": "MIT"

13
tests/sauceconnect.js Normal file
View File

@ -0,0 +1,13 @@
const sauceConnectLauncher = require('sauce-connect-launcher');
sauceConnectLauncher({
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY,
logger: console.log
}, err => {
if (err) {
console.error(err.message);
return;
}
console.log('Sauce Connect ready');
});

16
tests/selenium.js
View File

@ -6,7 +6,7 @@
url = require("url"), url = require("url"),
path = require("path"), path = require("path"),
base64_arraybuffer = require('base64-arraybuffer'), base64_arraybuffer = require('base64-arraybuffer'),
PNG = require('png-js'), PNG = require('pngjs').PNG,
Promise = require('bluebird'), Promise = require('bluebird'),
_ = require('lodash'), _ = require('lodash'),
humanizeDuration = require("humanize-duration"), humanizeDuration = require("humanize-duration"),
@ -20,9 +20,15 @@
var port = 8080; var port = 8080;
function getPixelArray(base64) { function getPixelArray(base64) {
return new Promise(function(resolve) { return new Promise(function(resolve, reject) {
var arraybuffer = base64_arraybuffer.decode(base64); const arraybuffer = base64_arraybuffer.decode(base64);
(new PNG(arraybuffer)).decodePixels(resolve); new PNG().parse(arraybuffer, (error, data) => {
if (error) {
reject(error);
} else {
resolve(data.data);
}
});
}); });
} }
@ -78,7 +84,7 @@
return Promise.resolve(browser return Promise.resolve(browser
.then(utils.loadTestPage(browser, test, port)) .then(utils.loadTestPage(browser, test, port))
.then(captureScreenshots(browser)) .then(captureScreenshots(browser))
.then(analyzeResults(test))).cancellable(); .then(analyzeResults(test)));
} }
exports.tests = function(browsers, singleTest) { exports.tests = function(browsers, singleTest) {