Skip to content

Commit

Permalink
Build: use different versions of jsdom for Node and iojs testing
Browse files Browse the repository at this point in the history
  • Loading branch information
timmywil committed May 7, 2015
1 parent 62d5579 commit 5c3101f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
27 changes: 27 additions & 0 deletions build/tasks/install_jsdom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = function( grunt ) {
grunt.registerTask( "jsdom", function() {
var current,
pkg = grunt.config( "pkg" ),
version = pkg.jsdomVersions[

// Unfortunately, this is currently the only
// way to tell the difference between Node and iojs
/^v0/.test( process.version ) ? "node" : "iojs"
];

try {
current = require( "jsdom/package.json" ).version;
if ( current === version ) {
return;
}
} catch ( e ) {}

// Use npm on the command-line
// There is no local npm
grunt.util.spawn( {
cmd: "npm",
args: [ "install", "jsdom@" + version ],
opts: { stdio: "inherit" }
}, this.async() );
});
};
2 changes: 1 addition & 1 deletion build/tasks/node_smoke_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function( grunt ) {
var fs = require( "fs" ),
spawnTest = require( "./lib/spawn_test.js" ),
testsDir = "./test/node_smoke_tests/",
nodeSmokeTests = [];
nodeSmokeTests = [ "jsdom" ];

// Fire up all tests defined in test/node_smoke_tests/*.js in spawned sub-processes.
// All the files under test/node_smoke_tests/*.js are supposed to exit with 0 code
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"grunt-jsonlint": "1.0.4",
"grunt-npmcopy": "0.1.0",
"gzip-js": "0.3.2",
"jsdom": "3.1.2",
"load-grunt-tasks": "1.0.0",
"native-promise-only": "0.7.8-a",
"promises-aplus-tests": "2.1.0",
Expand All @@ -54,6 +53,10 @@
"testswarm": "1.1.0",
"win-spawn": "2.0.0"
},
"jsdomVersions": {
"node": "3.1.2",
"iojs": "5.3.0"
},
"scripts": {
"build": "npm install && grunt",
"start": "grunt watch",
Expand Down

0 comments on commit 5c3101f

Please sign in to comment.