mirror of
https://github.com/videojs/video.js.git
synced 2024-12-25 02:42:10 +02:00
@forbesjo added chrome for PR tests. closes #3235
This commit is contained in:
parent
002b739930
commit
75116d4249
@ -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
|
||||
|
@ -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))
|
||||
|
||||
--------------------
|
||||
|
||||
|
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user