aboutsummaryrefslogtreecommitdiffstats
path: root/build/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'build/tasks')
-rw-r--r--build/tasks/install_jsdom.js27
-rw-r--r--build/tasks/install_old_jsdom.js20
-rw-r--r--build/tasks/node_smoke_tests.js2
3 files changed, 21 insertions, 28 deletions
diff --git a/build/tasks/install_jsdom.js b/build/tasks/install_jsdom.js
deleted file mode 100644
index 73142b654..000000000
--- a/build/tasks/install_jsdom.js
+++ /dev/null
@@ -1,27 +0,0 @@
-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() );
- } );
-};
diff --git a/build/tasks/install_old_jsdom.js b/build/tasks/install_old_jsdom.js
new file mode 100644
index 000000000..271e0cbe0
--- /dev/null
+++ b/build/tasks/install_old_jsdom.js
@@ -0,0 +1,20 @@
+module.exports = function( grunt ) {
+
+ "use strict";
+
+ // Run this task to run jsdom-related tests on Node.js < 1.0.0.
+ grunt.registerTask( "old_jsdom", function() {
+ if ( !/^v0/.test( process.version ) ) {
+ console.warn( "The old_jsdom task doesn\'t need to be run in io.js or new Node.js" );
+ return;
+ }
+
+ // Use npm on the command-line
+ // There is no local npm
+ grunt.util.spawn( {
+ cmd: "npm",
+ args: [ "install", "jsdom@3" ],
+ opts: { stdio: "inherit" }
+ }, this.async() );
+ } );
+};
diff --git a/build/tasks/node_smoke_tests.js b/build/tasks/node_smoke_tests.js
index 9334516d9..1b860b140 100644
--- a/build/tasks/node_smoke_tests.js
+++ b/build/tasks/node_smoke_tests.js
@@ -5,7 +5,7 @@ module.exports = function( grunt ) {
var fs = require( "fs" ),
spawnTest = require( "./lib/spawn_test.js" ),
testsDir = "./test/node_smoke_tests/",
- nodeSmokeTests = [ "jsdom", "babel:nodeSmokeTests" ];
+ nodeSmokeTests = [ "babel:nodeSmokeTests" ];
// 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