Skip to content

Commit

Permalink
@forbesjo added chrome for PR tests. closes videojs#3235
Browse files Browse the repository at this point in the history
  • Loading branch information
jforbes authored and gkatsev committed Apr 5, 2016
1 parent 002b739 commit 75116d4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Expand Up @@ -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:
Expand All @@ -25,3 +25,8 @@ cache:
- node_modules
addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -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))

--------------------

Expand Down
7 changes: 6 additions & 1 deletion test/karma.conf.js
Expand Up @@ -107,7 +107,7 @@ module.exports = function(config) {
'ie8_bs'
];
} else {
settings.browsers = ['Firefox'];
settings.browsers = ['chrome_travis', 'Firefox'];
}
}

Expand All @@ -116,6 +116,11 @@ module.exports = function(config) {

function getCustomLaunchers(){
return {
chrome_travis: {
base: 'Chrome',
flags: ['--no-sandbox']
},

chrome_bs: {
base: 'BrowserStack',
browser: 'chrome',
Expand Down

0 comments on commit 75116d4

Please sign in to comment.