diff --git a/.travis.yml b/.travis.yml index 2b9c01e399..cd001503dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - 0.12 before_install: - - export CHROME_BIN=chromium-browser + - export CHROME_BIN=/usr/bin/google-chrome - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start notifications: @@ -25,3 +25,8 @@ cache: - node_modules addons: firefox: latest + apt: + sources: + - google-chrome + packages: + - google-chrome-stable diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d1ef91ccc..6097bc9b60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ CHANGELOG * @scaryguy updated videojs cdn urls in the README ([view](https://github.com/videojs/video.js/pull/3195)) * @mister-ben updated the time tooltips to use the chosen font family ([view](https://github.com/videojs/video.js/pull/3213)) * @OwenEdwards improved handling of deprecated use of Button component ([view](https://github.com/videojs/video.js/pull/3236)) +* @forbesjo added chrome for PR tests ([view](https://github.com/videojs/video.js/pull/3235)) -------------------- diff --git a/test/karma.conf.js b/test/karma.conf.js index a4ec7de0c1..08f3c7f02f 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -107,7 +107,7 @@ module.exports = function(config) { 'ie8_bs' ]; } else { - settings.browsers = ['Firefox']; + settings.browsers = ['chrome_travis', 'Firefox']; } } @@ -116,6 +116,11 @@ module.exports = function(config) { function getCustomLaunchers(){ return { + chrome_travis: { + base: 'Chrome', + flags: ['--no-sandbox'] + }, + chrome_bs: { base: 'BrowserStack', browser: 'chrome',