upgrade to intern 2.1

Author: wkeese

Gruntfile.js

@@ -14,18 +14,18 @@ module.exports = function (grunt) {
 		jshint: {
 			all: filesList,
 			options: {
-				jshintrc: ".jshintrc",
-			},
+				jshintrc: ".jshintrc"
+			}
 		},
 
 		lineending: {
 			all: {
 				options: {
-					eol: 'crlf',
+					eol: "crlf",
 					overwrite: true
 				},
 				files: {
-					'': filesList
+					"": filesList
 				}
 			}
 		},
@@ -46,14 +46,14 @@ module.exports = function (grunt) {
 				options: {
 					runType: "runner",
 					config: "tests/intern",
-					reporters: ["console"]
+					reporters: ["runner"]
 				}
 			},
 			local: {
 				options: {
-					runType: 'runner', // defaults to 'client'
-					config: 'tests/intern.local',
-					reporters: ['console', 'lcov']
+					runType: "runner", // defaults to "client"
+					config: "tests/intern.local",
+					reporters: ["runner"]
 				}
 			}
 		}
@@ -63,7 +63,7 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks("grunt-contrib-jshint");
 	grunt.loadNpmTasks("grunt-jsbeautifier");
 	grunt.loadNpmTasks("grunt-lineending");
-	grunt.loadNpmTasks('intern');
+	grunt.loadNpmTasks("intern");
 
 
 	// By default, lint and run all tests.

package.json

@@ -7,7 +7,7 @@
 		"grunt-contrib-jshint": "~0.6.0",
 		"grunt-jsbeautifier": "~0.2.2",
 		"requirejs": "~2.1.10",
-		"intern": "~1.6.2",
+		"intern": "2.1.x",
 		"grunt-lineending": "^0.2.2"
 	},
 	"licenses": [
@@ -17,4 +17,4 @@
 		}
 	],
 	"private": true
-}
+}

tests/intern.js

@@ -6,8 +6,6 @@ define({
 	// The port on which the instrumenting proxy will listen
 	proxyPort: 9000,
 
-	proxyUrl: "http://127.0.0.1:9000/",
-
 	// Browsers to run integration testing against. Note that version numbers must be strings if used with Sauce
 	// OnDemand. Options that will be permutated are browserName, version, platform, and platformVersion; any other
 	// capabilities options specified for an environment will be copied as-is
@@ -74,15 +72,7 @@ define({
 	maxConcurrency: 3,
 
 	// Whether or not to start Sauce Connect before running tests
-	useSauceConnect: true,
-
-	// Connection information for the remote WebDriver service. If using Sauce Labs, keep your username and password
-	// in the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables unless you are sure you will NEVER be
-	// publishing this configuration file somewhere
-	webdriver: {
-		host: "localhost",
-		port: 4444
-	},
+	tunnel: "SauceLabsTunnel",
 
 	loader: {
 		baseUrl: typeof window !== "undefined" ? "../../.." : ".."

tests/intern.local.js

@@ -2,7 +2,11 @@
 define([
 	"./intern"
 ], function (intern) {
-	intern.useSauceConnect = false;
+	intern.tunnel = "NullTunnel";
+	intern.tunnelOptions = {
+		hostname: "localhost",
+		port: 4444
+	};
 
 	intern.environments = [{
 		browserName: "firefox"