CB-9370 Fixes failing tests on Node 0.12 due to stale dependency
This also adds Node@0.12 to test matrix for both Travis and AppVeyor
diff --git a/.travis.yml b/.travis.yml
index 9459afa..104ca31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@
depth: 10
node_js:
- "0.10"
+ - "0.12"
install:
- cd ..
- git clone https://github.com/apache/cordova-android --depth 10
diff --git a/appveyor.yml b/appveyor.yml
index dddec7f..dc23eec 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,16 @@
# appveyor file
# http://www.appveyor.com/docs/appveyor-yml
+environment:
+ matrix:
+ - nodejs_version: "0.12"
+ - nodejs_version: "0.10"
install:
+ - ps: Install-Product node $env:nodejs_version
+
+ - npm -g install npm
+ - set PATH=%APPDATA%\npm;%PATH%
+
- cd ..
- git clone https://github.com/apache/cordova-android --depth 10
- git clone https://github.com/apache/cordova-ios --depth 10
@@ -13,7 +22,7 @@
- git clone https://github.com/apache/cordova-amazon-fireos --depth 10
- git clone https://github.com/apache/cordova-webos --depth 10
- cd cordova-js
- - npm install
+ - npm install --msvs_version=2013
build: off
diff --git a/tasks/lib/test-jsdom.js b/tasks/lib/test-jsdom.js
index 2dbaf1c..5d3896e 100644
--- a/tasks/lib/test-jsdom.js
+++ b/tasks/lib/test-jsdom.js
@@ -23,12 +23,12 @@
var fs = require('fs');
var collect = require('./collect');
var jas = require('jasmine-node');
-var testLibName = path.join(__dirname, '..', '..', 'pkg', 'cordova.test.js')
-var testLib = fs.readFileSync(testLibName, 'utf8')
+var testLibName = path.join(__dirname, '..', '..', 'pkg', 'cordova.test.js');
+var testLib = fs.readFileSync(testLibName, 'utf8');
-var jsdom = require("jsdom-nogyp").jsdom;
-var document = jsdom(null, null, { url: 'file:///jsdomtest.info/a?b#c' });
-var window = document.createWindow();
+var jsdom = require("node-jsdom").jsdom;
+var document = jsdom(undefined, { url: 'file:///jsdomtest.info/a?b#c' });
+var window = document.parentWindow;
module.exports = function(callback) {