jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to PhantomJS 2.x for testing 

This commit switches over to use PhantomJS 2.x, bringing in a whole host
of improvements (including `Function#bind`, so we can remove the
`Function#bind` shim in core/util.js).
This commit is contained in:
Solly Ross 2016-09-03 13:53:47 -04:00
parent 3949a09534
commit 9eca6889be
4 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/util.js
View File

@ -11,41 +11,6 @@
var Util = {}; var Util = {};
var addFunc = function (cl, name, func) {
if (!cl.prototype[name]) {
Object.defineProperty(cl.prototype, name, { enumerable: false, value: func });
}
};
// PhantomJS 1.x doesn't support bind,
// so leave this in until PhantomJS 2.0 is released
//This prototype is provided by the Mozilla foundation and
//is distributed under the MIT license.
//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
addFunc(Function, 'bind', function (oThis) {
if (typeof this !== "function") {
// closest thing possible to the ECMAScript 5
// internal IsCallable function
throw new TypeError("Function.prototype.bind - " +
"what is trying to be bound is not callable");
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function () {},
fBound = function () {
return fToBind.apply(this instanceof fNOP && oThis ? this
: oThis,
aArgs.concat(Array.prototype.slice.call(arguments)));
};
fNOP.prototype = this.prototype;
fBound.prototype = new fNOP();
return fBound;
});
// //
// requestAnimationFrame shim with setTimeout fallback // requestAnimationFrame shim with setTimeout fallback
// //

5
package.json
View File

@ -41,14 +41,13 @@
"karma-chai": "^0.1.0", "karma-chai": "^0.1.0",
"karma-mocha": "^0.1.10", "karma-mocha": "^0.1.10",
"karma-mocha-reporter": "^1.0.0", "karma-mocha-reporter": "^1.0.0",
"karma-phantomjs-launcher": "^0.1.4", "karma-phantomjs-launcher": "^1.0.0",
"karma-sauce-launcher": "^0.2.10", "karma-sauce-launcher": "^0.2.10",
"karma-sinon": "^1.0.4", "karma-sinon": "^1.0.4",
"karma-sinon-chai-latest": "^0.1.0", "karma-sinon-chai-latest": "^0.1.0",
"mocha": "^2.1.0", "mocha": "^2.1.0",
"open": "^0.0.5", "open": "^0.0.5",
"phantom": "^0.7.2", "phantomjs-prebuilt": "^2.1.4",
"phantomjs": "^1.9.15",
"sinon": "^1.12.2", "sinon": "^1.12.2",
"sinon-chai": "^2.7.0", "sinon-chai": "^2.7.0",
"spooky": "^0.2.5", "spooky": "^0.2.5",

2
tests/run_from_console.casper.js
View File

@ -1,7 +1,7 @@
var Spooky = require('spooky'); var Spooky = require('spooky');
var path = require('path'); var path = require('path');
var phantom_path = require('phantomjs').path; var phantom_path = require('phantomjs-prebuilt').path;
var casper_path = path.resolve(__dirname, '../node_modules/casperjs/bin/casperjs'); var casper_path = path.resolve(__dirname, '../node_modules/casperjs/bin/casperjs');
process.env.PHANTOMJS_EXECUTABLE = phantom_path; process.env.PHANTOMJS_EXECUTABLE = phantom_path;
var casper_opts = { var casper_opts = {

2
tests/run_from_console.js
View File

@ -92,7 +92,7 @@ if (program.autoInject) {
var template = { var template = {
header: "<html>\n<head>\n<meta charset='utf-8' />\n<link rel='stylesheet' href='" + get_path('node_modules/mocha/mocha.css') + "'/>\n</head>\n<body><div id='mocha'></div>", header: "<html>\n<head>\n<meta charset='utf-8' />\n<link rel='stylesheet' href='" + get_path('node_modules/mocha/mocha.css') + "'/>\n</head>\n<body><div id='mocha'></div>",
script_tag: function(p) { return "<script src='" + p + "'></script>"; }, script_tag: function(p) { return "<script src='" + p + "'></script>"; },
footer: "<script>\nmocha.checkLeaks();\nmocha.globals(['navigator', 'create', 'ClientUtils', '__utils__']);\nmocha.run(function () { window.__mocha_done = true; });\n</script>\n</body>\n</html>" footer: "<script>\nmocha.checkLeaks();\nmocha.globals(['navigator', 'create', 'ClientUtils', '__utils__', 'requestAnimationFrame', 'WebSocket']);\nmocha.run(function () { window.__mocha_done = true; });\n</script>\n</body>\n</html>"
}; };
template.header += "\n" + template.script_tag(get_path('node_modules/chai/chai.js')); template.header += "\n" + template.script_tag(get_path('node_modules/chai/chai.js'));