Skip to content

Commit

Permalink
ignore: Use headless Chrome in Travis CI and VM instead of container (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
forbesjo authored Dec 12, 2017
1 parent 6e080be commit 47e8eec
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 83 deletions.
28 changes: 3 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
sudo: false
sudo: required
dist: trusty
language: node_js
node_js:
- 'node'
notifications:
hipchat:
rooms:
secure: l5TTd5JuPAW883PtcyaIBcJI9Chr9JpsZPQAEUBKAgIEwzuS6y7t5arlkS1PwH6gi1FADzYDf+OXSIou4GkTSrIetnBcT/SAgF0gBKgIhj+eRkuCfZ4VaC7BPhfZ0hgYRE+5Ejf5BM2MJafRm0pj7OlqG4xKrQZwtuV1te5r3JY=
irc:
channels:
- "chat.freenode.net#videojs"
use_notice: true
before_script:
# always install the appropriate version of video.js for the environment
- npm i "video.js@$VJS";
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
env:
- VJS=5
- VJS=6
- 8
addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
chrome: stable
116 changes: 67 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@
"isparta": "^4.0.0",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.0",
"karma": "^0.13.0",
"karma": "^1.7.1",
"karma-browserify": "^4.4.0",
"karma-chrome-launcher": "^0.2.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-detect-browsers": "^2.0.0",
"karma-firefox-launcher": "^0.1.0",
Expand Down
8 changes: 1 addition & 7 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(config) {
};

if (process.env.TRAVIS) {
config.browsers = ['travisChrome'];
config.browsers = ['ChromeHeadless'];
}

// If no browsers are specified, we enable `karma-detect-browsers`
Expand Down Expand Up @@ -66,12 +66,6 @@ module.exports = function(config) {
return file.originalPath;
}
},
customLaunchers: {
travisChrome: {
base: 'Chrome',
flags: ['--no-sandbox']
}
},
detectBrowsers: detectBrowsers,
reporters: ['dots'],
port: 9876,
Expand Down

0 comments on commit 47e8eec

Please sign in to comment.