From d5b716cc73fa2f09ac1a1090cefecec5019676ea Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Thu, 16 Jul 2015 09:53:19 +0300 Subject: [PATCH 1/2] CB-9291 Removes the requirement for specific NodeJS version --- package.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 78c005cc2..763a33aa6 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,6 @@ "type": "git", "url": "http://git-wip-us.apache.org/repos/asf/cordova-js.git" }, - "engines": { - "node": "~0.10.x" - }, "scripts": { "test": "grunt test", "build": "grunt compile", @@ -59,7 +56,7 @@ }, { "name": "Steve Gill", - "email": "stevengill97@gmail.com" + "email": "stevengill97@gmail.com" } ], "devDependencies": { @@ -69,7 +66,7 @@ "grunt-contrib-jshint": "0.10.0", "istanbul": "^0.3.4", "jasmine-node": "1.14.5", - "jsdom-nogyp": "0.8.3", + "node-jsdom": "~3.x", "mkdirp": "^0.5.0", "grunt-cli": "0.1.13" }, From eb620e2934e2d6706e71a2f8957343935d6dcf32 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Wed, 15 Jul 2015 16:05:21 +0300 Subject: [PATCH 2/2] 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 --- .travis.yml | 1 + appveyor.yml | 11 ++++++++++- tasks/lib/test-jsdom.js | 10 +++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9459afac1..104ca3180 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ git: 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 dddec7ffb..dc23eec8b 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 @@ install: - 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 2dbaf1c7b..5d3896eb4 100644 --- a/tasks/lib/test-jsdom.js +++ b/tasks/lib/test-jsdom.js @@ -23,12 +23,12 @@ var path = require('path'); 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) {