diff --git a/.travis.yml b/.travis.yml index 11448ec7..cd58397b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ sudo: false language: node_js +addons: + firefox: "latest" node_js: - - 'node' - - '4.2' - - '0.12' - - '0.10' + - "stable" notifications: hipchat: rooms: diff --git a/package.json b/package.json index 71b86b1f..3f099052 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "dependencies": { "pkcs7": "^0.2.2", "video.js": "^5.2.1", - "videojs-contrib-media-sources": "^2.4.4", + "videojs-contrib-media-sources": "^3.0.0", "videojs-swf": "^5.0.0" }, "devDependencies": { @@ -124,6 +124,7 @@ "sinon": "1.10.2", "uglify-js": "^2.5.0", "videojs-standard": "^4.0.0", - "watchify": "^3.6.0" + "watchify": "^3.6.0", + "webworkify": "^1.1.0" } } diff --git a/test/videojs-contrib-hls.test.js b/test/videojs-contrib-hls.test.js index cdd5cd9b..5233a562 100644 --- a/test/videojs-contrib-hls.test.js +++ b/test/videojs-contrib-hls.test.js @@ -311,6 +311,10 @@ QUnit.test('starts playing if autoplay is specified', function() { type: 'application/vnd.apple.mpegurl' }); + // REMOVEME workaround https://github.com/videojs/video.js/issues/2326 + this.player.tech_.triggerReady(); + this.clock.tick(1); + // make sure play() is called *after* the media source opens this.player.tech_.hls.play = function() { plays++;