Skip to content
This repository was archived by the owner on Jun 14, 2019. It is now read-only.

Commit 60aa1cb

Browse files
committed
Merge branch 'canary'
2 parents 18a2c63 + 022b311 commit 60aa1cb

File tree

10 files changed

+3444
-1176
lines changed

10 files changed

+3444
-1176
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.2
1+
8.9

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
sudo: false
1+
dist: trusty
2+
sudo: required
23
language: node_js
34
node_js:
4-
- "8.2"
5+
- "8.9"
56

67
addons:
8+
chrome: stable
79
code_climate:
810
repo_token: 94ea5ac76984c311dcbadb53a52dd219400775e20402587a0063d8b9d3a66bca
911

12+
before_install:
13+
- sudo chown root /opt/google/chrome/chrome-sandbox
14+
- sudo chmod 4755 /opt/google/chrome/chrome-sandbox
15+
1016
before_script:
1117
- export DISPLAY=:99.0
12-
- sh -e /etc/init.d/xvfb start
18+
- sh -e /etc/init.d/xvfb start &
19+
- sleep 3
1320

1421
after_script:
1522
- if [ "$TEST_SCOPE" == "" ]; then npm install -g codeclimate-test-reporter && codeclimate-test-reporter < build/coverage/lcov.info; fi
@@ -37,10 +44,3 @@ env:
3744
matrix:
3845
allow_failures:
3946
- env: TEST_SCOPE= SAUCE_ENABLED=$_SAUCE_ENABLED SAUCE_USERNAME=$_SAUCE_USERNAME SAUCE_ACCESS_KEY=$_SAUCE_ACCESS_KEY
40-
41-
addons:
42-
apt:
43-
sources:
44-
- ubuntu-toolchain-r-test
45-
packages:
46-
- g++-4.8

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Jan Philipp",
33
"name": "angular-vertxbus",
44
"description": "AngularJS facade and service acting as a Vert.x SockJS client",
5-
"version": "6.3.0",
5+
"version": "6.4.0",
66
"homepage": "http://github.com/knalli/angular-vertxbus",
77
"main": "./dist/angular-vertxbus.js",
88
"keywords": [
@@ -29,7 +29,7 @@
2929
"dependencies": {
3030
"angular": ">=1.2 <1.7",
3131
"sockjs-client": "~1.1.0",
32-
"vertx3-eventbus-client": "~3.4.0"
32+
"vertx3-eventbus-client": "~3.5.0"
3333
},
3434
"devDependencies": {
3535
"angular": "~1.6.2",

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ module.exports = function (config) {
316316
if (sourcelabsConfig.enabled) {
317317
browsers = [...browsers, ...Object.keys(sourcelabsConfig.launchers)];
318318
} else if (process.env.TRAVIS) {
319-
browsers.push('Firefox');
319+
browsers.push('ChromeHeadless');
320320
} else {
321321
if (process.env.NO_HEADLESS) {
322322
browsers.push('Chrome');

0 commit comments

Comments
 (0)