Karma chameleon

.gitignore

@@ -15,9 +15,6 @@ npm-debug.log
 sandbox/*
 !sandbox/*.example
 
-# ignore any Karma conf.js files in the test/ directory
-test/*.conf.js
-
 *.swp
 *.swo
 

.jshintrc

@@ -22,6 +22,7 @@
         "define",
         "module",
         "exports",
+        "process",
 
         "PlayerTest",
         "asyncTest",

.travis.yml

@@ -1,3 +1,14 @@
 language: node_js
 node_js:
-  - 0.8
+- 0.10
+before_script:
+- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#videojs"
+    use_notice: true
+env:
+  global:
+  - secure: K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=
+  - secure: GIbhjUJapvC70nIZVlhVyK+3KAD2TVKpiY/q412OO7V2izbvcM1tvU3LBoMZbROzrt5TT84tCoJDvHnrpL0OvxPwrzL5CUU7h4UTxhTOyQkEinbYAnWlW9wdrvtdczsEvANkFPqBZ53B3hVHZHMLOG8QRWaTBicF68vSHEJFqb4=

CHANGELOG.md

@@ -2,7 +2,14 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* Updated the UI to support live video ([view](https://github.com/videojs/video.js/pull/1121))
+* The UI now resets after a source change ([view](https://github.com/videojs/video.js/pull/1124))
+* Now assuming smart CSS defaults for sliders to prevent reflow on player init ([view](https://github.com/videojs/video.js/pull/1122))
+* Fixed the title element placement in menus [[view](https://github.com/videojs/video.js/pull/1114)]
+* Fixed title support for menu buttons ([view](https://github.com/videojs/video.js/pull/1128))
+* Fixed extra mousemove events on Windows caused by certain apps, not users [[view](https://github.com/videojs/video.js/pull/1068)]
+* Fixed error due to undefined tech when no source is supported [[view](https://github.com/videojs/video.js/pull/1172)]
+* Fixed the progress bar not finishing when manual timeupdate events are used [[view](https://github.com/videojs/video.js/pull/1173)]
 
 --------------------
 

Gruntfile.js

@@ -135,16 +135,97 @@ module.exports = function(grunt) {
       }
     },
     karma: {
+      // this config file applies to all following configs except if overwritten
       options: {
         configFile: 'test/karma.conf.js'
       },
+
+      // this only runs on PRs from the mainrepo on saucelabs
+      saucelabs: {
+        browsers: ['chrome_sl', 'ipad_sl']
+      },
+
+      // these are run locally on local browsers
       dev: {
-        configFile: 'test/karma.conf.js',
-        autoWatch: true
+        browsers: ['Chrome', 'Firefox', 'Safari']
+      },
+      chromecanary: {
+        browsers: ['ChromeCanary']
+      },
+      chrome: {
+        browsers: ['Chrome']
+      },
+      firefox: {
+        browsers: ['Firefox']
+      },
+      safari: {
+        browsers: ['Safari']
+      },
+      ie: {
+        browsers: ['IE']
+      },
+      phantomjs: {
+        browsers: ['PhantomJS']
+      },
+
+      // This is all the minified tests run locally on local browsers
+      minified_dev: {
+        browsers: ['Chrome', 'Firefox', 'Safari'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_chromecanary: {
+        browsers: ['ChromeCanary'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_chrome: {
+        browsers: ['Chrome'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_firefox: {
+        browsers: ['Firefox'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_safari: {
+        browsers: ['Safari'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_ie: {
+        browsers: ['IE'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+      minified_phantomjs: {
+        browsers: ['PhantomJS'],
+        configFile: 'test/karma.minified.conf.js'
+      },
+
+      // This is all the minified api tests run locally on local browsers
+      minified_api_dev: {
+        browsers: ['Chrome', 'Firefox', 'Safari'],
+        configFile: 'test/karma.minified.api.conf.js'
       },
-      ci: {
-        configFile: 'test/karma.conf.js',
-        autoWatch: false
+      minified_api_chromecanary: {
+        browsers: ['ChromeCanary'],
+        configFile: 'test/karma.minified.api.conf.js'
+      },
+      minified_api_chrome: {
+        browsers: ['Chrome'],
+        configFile: 'test/karma.minified.api.conf.js'
+      },
+      minified_api_firefox: {
+        browsers: ['Firefox'],
+        configFile: 'test/karma.minified.api.conf.js'
+      },
+      minified_api_safari: {
+        browsers: ['Safari'],
+        configFile: 'test/karma.minified.api.conf.js'
+      },
+      minified_api_ie: {
+        browsers: ['IE'],
+        configFile: 'test/karma.minified.api.conf.js'
+      },
+      minified_api_phantomjs: {
+        browsers: ['PhantomJS'],
+        configFile: 'test/karma.minified.api.conf.js'
       }
     },
     vjsdocs: {
@@ -235,7 +316,50 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'usebanner', 'dist']);
   // Development watch task
   grunt.registerTask('dev', ['jshint', 'less', 'build', 'qunit:source']);
-  grunt.registerTask('test', ['jshint', 'less', 'build', 'minify', 'usebanner', 'qunit']);
+  grunt.registerTask('test-qunit', ['jshint', 'less', 'build', 'minify', 'usebanner', 'qunit']);
+
+  // The test task will run `karma:saucelabs` when running in travis,
+  // when running via a PR from a fork, it'll run qunit tests in phantom using karma
+  // otherwise, it'll run the tests in chrome via karma
+  grunt.registerTask('test', function() {
+    var tasks = this.args,
+        tasksMinified,
+        tasksMinifiedApi;
+
+    grunt.task.run(['jshint', 'less', 'build', 'minify', 'usebanner']);
+
+    if (process.env.TRAVIS_PULL_REQUEST) {
+      grunt.task.run(['karma:phantomjs', 'karma:minified_phantomjs', 'karma:minified_api_phantomjs']);
+    } else if (process.env.TRAVIS) {
+      grunt.task.run(['karma:saucelabs']);
+    } else {
+      if (tasks.length === 0) {
+        tasks.push('chrome');
+      }
+      if (tasks.length === 1) {
+        tasks = tasks[0].split(',');
+      }
+
+      tasksMinified = tasks.slice();
+      tasksMinifiedApi = tasks.slice();
+
+      tasksMinified = tasksMinified.map(function(task) {
+        return 'minified_' + task;
+      });
+
+      tasksMinifiedApi = tasksMinifiedApi.map(function(task) {
+        return 'minified_api_' + task;
+      });
+
+      tasks = tasks.concat(tasksMinified).concat(tasksMinifiedApi);
+      tasks = tasks.map(function(el) {
+        return 'karma:' + el;
+      });
+
+
+      grunt.task.run(tasks);
+    }
+  });
 
   var fs = require('fs'),
       gzip = require('zlib').gzip;

build/source-loader.js

@@ -26,6 +26,7 @@ var sourceFiles = [
   "src/js/menu.js",
   "src/js/player.js",
   "src/js/control-bar/control-bar.js",
+  "src/js/control-bar/live-display.js",
   "src/js/control-bar/play-toggle.js",
   "src/js/control-bar/time-display.js",
   "src/js/control-bar/fullscreen-toggle.js",