Fix intern tests

- don't tell intern to use the console reporter
- remove unnecessary requirejs path stuff
- update deps

package.json

@@ -40,6 +40,6 @@
     "grunt-wait": "~0.1.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-cli": "~0.1.11",
-    "grunt-selenium-server": "0.0.1"
+    "grunt-selenium-server": "^0.1.0"
   }
 }

tests/quick.js

@@ -15,7 +15,7 @@ define({
   // Note that the `build` capability will be filled in with the current commit ID from the Travis CI environment
   // automatically
   capabilities: {
-    'selenium-version': '2.37.0'
+    'selenium-version': '2.42.2'
   },
 
   // Browsers to run integration testing against. Note that version numbers must be strings if used with Sauce
@@ -44,22 +44,12 @@ define({
   // loader
   useLoader: {
     'host-node': 'requirejs',
-    'host-browser': '../../node_modules/requirejs/require.js'
+    'host-browser': '../requirejs/require.js'
   },
 
   // Configuration options for the module loader; any AMD configuration options supported by the specified AMD loader
   // can be used here
   loader: {
-    baseUrl: './',
-
-    paths: {
-      'lodash': 'node_modules/lodash/lodash',
-      'rsvp': 'node_modules/rsvp/dist/rsvp.amd',
-      'text': 'vendor/text',
-      'tiny-jsonrpc': 'node_modules/tiny-jsonrpc/lib/tiny-jsonrpc',
-      'tiny-jsonrpc-postmessage': 'node_modules/' +
-        'tiny-jsonrpc-postmessage/lib/tiny-jsonrpc-postmessage'
-    }
   },
 
   // Non-functional test suite(s) to run in each browser
@@ -69,7 +59,5 @@ define({
   functionalSuites: [ /* 'myPackage/tests/functional' */ ],
 
   // A regular expression matching URLs to files that should not be included in code coverage analysis
-  excludeInstrumentation: /^.*/,
-
-  reporters: ['runner']
+  excludeInstrumentation: /./
 });

tests/slow.js

@@ -15,24 +15,24 @@ define({
   // Note that the `build` capability will be filled in with the current commit ID from the Travis CI environment
   // automatically
   capabilities: {
-    'selenium-version': '2.37.0'
+    'selenium-version': '2.42.2'
   },
 
   // 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
   environments: [
-    { browserName: 'internet explorer', version: '10', platform: 'Windows 2012' },
-    { browserName: 'firefox', platform: 'Mac 10.9' },
-    { browserName: 'chrome', platform: 'Mac 10.9' },
-    { browserName: 'safari', version: '6', platform: 'Mac 10.8' }
+    /*{ browserName: 'internet explorer', version: '10', platform: 'Windows 2012' },*/
+    { browserName: 'firefox', version: '33', platform: 'Mac 10.9' },
+    /*{ browserName: 'chrome', platform: 'Mac 10.9' },
+    { browserName: 'safari', version: '6', platform: 'Mac 10.8' }*/
   ],
 
   // Maximum number of simultaneous integration tests that should be executed on the remote WebDriver service
   maxConcurrency: 3,
 
-  // Whether or not to start Sauce Connect before running tests
-  useSauceConnect: true,
+
+  tunnel: 'SauceLabsTunnel',
 
   // 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
@@ -47,22 +47,12 @@ define({
   // loader
   useLoader: {
     'host-node': 'requirejs',
-    'host-browser': '../../node_modules/requirejs/require.js'
+    'host-browser': '../requirejs/require.js'
   },
 
   // Configuration options for the module loader; any AMD configuration options supported by the specified AMD loader
   // can be used here
   loader: {
-    baseUrl: './',
-
-    paths: {
-      'lodash': 'node_modules/lodash/lodash',
-      'rsvp': 'node_modules/rsvp/dist/rsvp.amd',
-      'text': 'vendor/text',
-      'tiny-jsonrpc': 'node_modules/tiny-jsonrpc/lib/tiny-jsonrpc',
-      'tiny-jsonrpc-postmessage': 'node_modules/' +
-        'tiny-jsonrpc-postmessage/lib/tiny-jsonrpc-postmessage'
-    }
   },
 
   // Non-functional test suite(s) to run in each browser
@@ -72,7 +62,5 @@ define({
   functionalSuites: [ /* 'myPackage/tests/functional' */ ],
 
   // A regular expression matching URLs to files that should not be included in code coverage analysis
-  excludeInstrumentation: /^.*/,
-
-  reporters: ['runner']
+  excludeInstrumentation: /./
 });