Merge pull request #37 from videojs/saucytravis3_thefinaldimension

Fix package.json and don't use saucelabs.

 language: node_js
 node_js:
-- '0.8'
+- '0.10'
 before_script:
 - npm install -g grunt-cli
-- curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 notifications:
   hipchat:
     rooms:
       secure: l5TTd5JuPAW883PtcyaIBcJI9Chr9JpsZPQAEUBKAgIEwzuS6y7t5arlkS1PwH6gi1FADzYDf+OXSIou4GkTSrIetnBcT/SAgF0gBKgIhj+eRkuCfZ4VaC7BPhfZ0hgYRE+5Ejf5BM2MJafRm0pj7OlqG4xKrQZwtuV1te5r3JY=
   irc: chat.freenode.net#videojs
-addons:
-  sauce_connect:
-    username: 
-      secure: "Y++AtTlMXkcPAx+K0cL6uzn4FlmfiIki5bkGCkowoYSCxq1X9tNta39JONSVSeZKBlP58GJwNJdB4Wq1CpJL4NriGc3UvpcgNcrILGOWLczX0zFvXkOIaLn0bUuierf4wzUjk3i6XOh83NrMaX+gBHXb8RVUEBf2z0/WM3zHrEM="
-    access_key:
-      secure: "bCan88WIWqm6jP4ZtDbLVrrGXe1a33otfQhi7SYp95wHFLemUHS1JyXv+HbbbsW5dNjatfdhzvc47bpw4LbccL6evVR9sb2Tld15TxW2a2WQtMPzvOfj55aP1YQtIxYwy14swifWGK/Lj/A0ZUCUNolCf7DjCK6hZGaWaDRtdIE="
+#addons:
+  #sauce_connect:
+    #username:
+      #secure: "Y++AtTlMXkcPAx+K0cL6uzn4FlmfiIki5bkGCkowoYSCxq1X9tNta39JONSVSeZKBlP58GJwNJdB4Wq1CpJL4NriGc3UvpcgNcrILGOWLczX0zFvXkOIaLn0bUuierf4wzUjk3i6XOh83NrMaX+gBHXb8RVUEBf2z0/WM3zHrEM="
+    #access_key:
+      #secure: "bCan88WIWqm6jP4ZtDbLVrrGXe1a33otfQhi7SYp95wHFLemUHS1JyXv+HbbbsW5dNjatfdhzvc47bpw4LbccL6evVR9sb2Tld15TxW2a2WQtMPzvOfj55aP1YQtIxYwy14swifWGK/Lj/A0ZUCUNolCf7DjCK6hZGaWaDRtdIE="

@@ -200,7 +200,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-open');
   grunt.loadNpmTasks('grunt-concurrent');
-  grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-contrib-watch');
   
 
@@ -260,10 +259,10 @@ module.exports = function(grunt) {
                       'concat',
                       'uglify']);
 
-  grunt.registerTask('test', ['manifests-to-js', 'karma:saucelabs']);
+  grunt.registerTask('test', ['jshint', 'manifests-to-js', 'karma:saucelabs']);
 
   // travis build task
-  grunt.registerTask('build:travis', ['jshint', 'test:node', 'test:sauce-browser']);
+  grunt.registerTask('test-local', ['jshint', 'manifests-to-js', 'qunit']);
 
 
 };

@@ -10,7 +10,7 @@
   },
   "license": "Apache 2",
   "scripts": {
-    "test": "grunt test"
+    "test": "grunt test-local"
   },
   "devDependencies": {
     "grunt-contrib-jshint": "~0.6.0",
@@ -33,7 +33,7 @@
     "karma-opera-launcher": "~0.1.0",
     "karma-phantomjs-launcher": "~0.1.1",
     "karma-safari-launcher": "~0.1.1",
-    "karma-qunit": "~0.1.1"
+    "karma-qunit": "~0.1.1",
     "video.js": "^4.5"
   },
   "peerDependencies": {

@@ -11,6 +11,7 @@
   "boss": true,
   "eqnull": true,
   "browser": true,
+  "node": true,
   "predef": [
     "QUnit",
     "module",
@@ -26,6 +27,7 @@
     "notDeepEqual",
     "strictEqual",
     "notStrictEqual",
-    "throws"
+    "throws",
+    "process"
   ]
 }

@@ -26,11 +26,11 @@ module.exports = function(config) {
     // - PhantomJS
     // - IE (only Windows)
     // Example usage:
-    browsers: ['chrome_test', 
-              //'firefox_test', 
-              //'safari_test', '
-              //'ipad_test', 
-              'android_test'],
+    browsers: ['chrome_test'],
+              //'firefox_test',
+              //'safari_test',
+              //'ipad_test',
+              //'android_test'
 
     // List of files / patterns to load in the browser
     // Add any new src files to this list.
@@ -98,11 +98,11 @@ module.exports = function(config) {
 
     // global config for SauceLabs
     sauceLabs: {
-      username: "sheff555",
-      accessKey: "d04372cc-0fc3-4e59-aa02-3cfd9df03240",
       startConnect: true,
-      tunnelIdentifier: 'uniquekarmaidentifier',
-      testName: 'ps test sample'
+      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
+      build: process.env.TRAVIS_BUILD_NUMBER,
+      testName: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
+      recordScreenshots: false
     },
 
     //define SL browsers