Merge pull request #83 from SoapBox/npm-updates

Nick Frasser · Nick Frasser · commit f8ded371b9b7 · 2015-11-05T22:14:06.000-05:00
Maintenance and NPM dependency updates
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
+sudo: false
 language: node_js
 node_js:
-  - "0.12"
-  - "0.10"
+  - "5.0"
+  - "4.2"
   - "iojs"
 env:
   global:
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,7 +1,7 @@
 var gulp = require('gulp'),
 amdOptimize = require('amd-optimize'),
 glob = require('glob'),
-karma = require('karma').server,
+Server = require('karma').Server,
 merge = require('merge-stream'),
 path = require('path'),
 stylish = require('jshint-stylish'),
@@ -241,24 +241,27 @@ gulp.task('coverage', ['build'], function (cb) {
 	});
 });
 
-gulp.task('karma', ['build'], function () {
-	return karma.start({
+gulp.task('karma', ['build'], function (done) {
+	var server = new Server({
 		configFile: __dirname + '/test/dev.conf.js',
 		singleRun: true
-	});
+	}, done);
+	return server.start();
 });
 
-gulp.task('karma-chrome', ['build'], function () {
-	return karma.start({
+gulp.task('karma-chrome', ['build'], function (done) {
+	var server = new Server({
 		configFile: __dirname + '/test/chrome.conf.js',
-	});
+	}, done);
+	return server.start();
 });
 
-gulp.task('karma-ci', ['build'], function () {
-	return karma.start({
+gulp.task('karma-ci', ['build'], function (done) {
+	var server = new Server({
 		configFile: __dirname + '/test/ci.conf.js',
 		singleRun: true
-	});
+	}, done);
+	return server.start();
 });
 
 // Build the deprecated legacy interface
diff --git a/package.json b/package.json
@@ -29,37 +29,38 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "amd-optimize": "^0.4.3",
-    "brfs": "^1.4.0",
-    "closure-compiler": "^0.2.6",
-    "coveralls": "^2.11.2",
+    "amd-optimize": "^0.6.1",
+    "brfs": "^1.4.1",
+    "closure-compiler": "0.2.6",
+    "coveralls": "^2.11.4",
     "expect.js": "^0.3.1",
-    "glob": "^5.0.3",
+    "glob": "^5.0.15",
     "gulp": "^3.8.11",
-    "gulp-babel": "^5.1.0",
-    "gulp-closure-compiler": "^0.2.14",
-    "gulp-concat": "^2.5.2",
-    "gulp-istanbul": "^0.10.0",
-    "gulp-jshint": "^1.9.2",
-    "gulp-mocha": "^2.1.0",
+    "gulp-babel": "^5.3.0",
+    "gulp-closure-compiler": "^0.3.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-istanbul": "^0.10.2",
+    "gulp-jshint": "^1.12.0",
+    "gulp-mocha": "^2.1.3",
     "gulp-rename": "^1.2.0",
-    "gulp-replace": "^0.5.3",
-    "gulp-uglify": "^1.1.0",
+    "gulp-replace": "^0.5.4",
+    "gulp-uglify": "^1.4.2",
     "gulp-wrap": "^0.11.0",
-    "jsdom": "^3.0.0",
-    "jshint-stylish": "^2.0.0",
-    "karma": "^0.12.32",
-    "karma-browserify": "^4.0.0",
-    "karma-chrome-launcher": "^0.1.7",
+    "jsdom": "^6.5.1",
+    "jshint-stylish": "^2.0.1",
+    "karma": "^0.13.15",
+    "karma-browserify": "^4.4.0",
+    "karma-chrome-launcher": "^0.2.1",
     "karma-firefox-launcher": "^0.1.6",
-    "karma-mocha": "^0.1.10",
-    "karma-phantomjs-launcher": "^0.2.0",
-    "karma-sauce-launcher": "^0.2.10",
-    "lodash": "^3.9.3",
-    "merge-stream": "^0.1.7",
-    "mocha": "^2.2.1"
+    "karma-mocha": "^0.2.0",
+    "karma-phantomjs-launcher": "^0.2.1",
+    "karma-sauce-launcher": "^0.3.0",
+    "lodash": "^3.10.1",
+    "merge-stream": "^1.0.0",
+    "mocha": "^2.3.3",
+    "phantomjs": "^1.9.18"
   },
   "optionalDependencies": {
-    "jquery": "^1.11.1"
+    "jquery": ">=1.9.0"
   }
 }
diff --git a/test/conf.js b/test/conf.js
@@ -65,4 +65,4 @@ module.exports = {
 	// Continuous Integration mode
 	// if true, Karma captures browsers, runs the tests and exits
 	singleRun: false
-}
+};
diff --git a/test/spec/linkify-element-test.js b/test/spec/linkify-element-test.js
@@ -10,6 +10,8 @@ try {
 	doc = null;
 }
 
+jsdom = doc ? null : require('jsdom');
+
 describe('linkify-element', function () {
 
 	/**
@@ -31,9 +33,6 @@ describe('linkify-element', function () {
 			return onDoc(doc);
 		}
 
-		// no document element, use a virtual dom to test
-		jsdom = require('jsdom');
-
 		jsdom.env(
 			'<html><head><title>Linkify Test</title></head><body></body></html>',
 			function (errors, window) {
