1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-27 11:22:06 +02:00

@forbesjo added chrome for PR tests. closes #3235

This commit is contained in:
jforbes 2016-04-05 13:36:33 -04:00 committed by Gary Katsevman
parent 002b739930
commit 75116d4249
3 changed files with 13 additions and 2 deletions

View File

@ -2,7 +2,7 @@ language: node_js
node_js: node_js:
- 0.12 - 0.12
before_install: before_install:
- export CHROME_BIN=chromium-browser - export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
notifications: notifications:
@ -25,3 +25,8 @@ cache:
- node_modules - node_modules
addons: addons:
firefox: latest firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

View File

@ -14,6 +14,7 @@ CHANGELOG
* @scaryguy updated videojs cdn urls in the README ([view](https://github.com/videojs/video.js/pull/3195)) * @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)) * @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)) * @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))
-------------------- --------------------

View File

@ -107,7 +107,7 @@ module.exports = function(config) {
'ie8_bs' 'ie8_bs'
]; ];
} else { } else {
settings.browsers = ['Firefox']; settings.browsers = ['chrome_travis', 'Firefox'];
} }
} }
@ -116,6 +116,11 @@ module.exports = function(config) {
function getCustomLaunchers(){ function getCustomLaunchers(){
return { return {
chrome_travis: {
base: 'Chrome',
flags: ['--no-sandbox']
},
chrome_bs: { chrome_bs: {
base: 'BrowserStack', base: 'BrowserStack',
browser: 'chrome', browser: 'chrome',