Skip to content

Commit

Permalink
revert 75116d4 adding chrome to travis (videojs#3254)
Browse files Browse the repository at this point in the history
  • Loading branch information
gkatsev committed Apr 19, 2016
1 parent a347c1d commit 048dad4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
- 0.12
before_install:
- export CHROME_BIN=/usr/bin/google-chrome
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
notifications:
Expand All @@ -25,8 +25,3 @@ cache:
- node_modules
addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
7 changes: 1 addition & 6 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ module.exports = function(config) {
'ie8_bs'
];
} else {
settings.browsers = ['chrome_travis', 'Firefox'];
settings.browsers = ['Firefox'];
}
}

Expand All @@ -116,11 +116,6 @@ 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 048dad4

Please sign in to comment.