aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2016-02-10 12:57:49 +0100
committerMichał Gołębiowski <m.goleb@gmail.com>2016-02-10 12:57:49 +0100
commitc7431c7793f7605250807f91bee7c9ddcbaeb91b (patch)
treef9a5810d0631eade4837974756c6c9ab4b91cca5
parent991e3f3e2a3c81944c9d9e35ed52b0eb7a4bb1c9 (diff)
downloadjquery-c7431c7793f7605250807f91bee7c9ddcbaeb91b.tar.gz
jquery-c7431c7793f7605250807f91bee7c9ddcbaeb91b.zip
Build: Drop testing on jsdom with Node 0.10 & 0.12
Fixes gh-2841
-rw-r--r--Gruntfile.js14
-rw-r--r--build/tasks/install_old_jsdom.js20
2 files changed, 3 insertions, 31 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 094cd5b98..723bc12cc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,17 +15,9 @@ module.exports = function( grunt ) {
var fs = require( "fs" ),
gzip = require( "gzip-js" ),
srcHintOptions = readOptionalJSON( "src/.jshintrc" ),
- newNode = !/^v0/.test( process.version ),
-
- // Allow to skip jsdom-related tests in Node.js < 1.0.0
- runJsdomTests = newNode || ( function() {
- try {
- require( "jsdom" );
- return true;
- } catch ( e ) {
- return false;
- }
- } )();
+
+ // Skip jsdom-related tests in Node.js 0.10 & 0.12
+ runJsdomTests = !/^v0/.test( process.version );
if ( !grunt.option( "filename" ) ) {
grunt.option( "filename", "jquery.js" );
diff --git a/build/tasks/install_old_jsdom.js b/build/tasks/install_old_jsdom.js
deleted file mode 100644
index 271e0cbe0..000000000
--- a/build/tasks/install_old_jsdom.js
+++ /dev/null
@@ -1,20 +0,0 @@
-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() );
- } );
-};