You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/07/16 09:05:38 UTC
[1/2] js commit: CB-9291 Removes the requirement for specific NodeJS
version
Repository: cordova-js
Updated Branches:
refs/heads/master 1ab1e94ab -> eb620e293
CB-9291 Removes the requirement for specific NodeJS version
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d5b716cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d5b716cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d5b716cc
Branch: refs/heads/master
Commit: d5b716cc73fa2f09ac1a1090cefecec5019676ea
Parents: 1ab1e94
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Thu Jul 16 09:53:19 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Thu Jul 16 09:53:19 2015 +0300
----------------------------------------------------------------------
package.json | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d5b716cc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 78c005c..763a33a 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"
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] js commit: CB-9370 Fixes failing tests on Node 0.12 due to
stale dependency
Posted by an...@apache.org.
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
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/eb620e29
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/eb620e29
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/eb620e29
Branch: refs/heads/master
Commit: eb620e2934e2d6706e71a2f8957343935d6dcf32
Parents: d5b716c
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Wed Jul 15 16:05:21 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Thu Jul 16 10:05:57 2015 +0300
----------------------------------------------------------------------
.travis.yml | 1 +
appveyor.yml | 11 ++++++++++-
tasks/lib/test-jsdom.js | 10 +++++-----
3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/eb620e29/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9459afa..104ca31 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
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/eb620e29/appveyor.yml
----------------------------------------------------------------------
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 @@ 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
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/eb620e29/tasks/lib/test-jsdom.js
----------------------------------------------------------------------
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 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org