Skip to content

Commit 53fca0e

Browse files
committed
Fix xvfb error on travis
1 parent aa52b74 commit 53fca0e

3 files changed

Lines changed: 20 additions & 14 deletions

File tree

.travis.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ node_js:
44
notifications:
55
email: false
66
dist: trusty
7-
sudo: required
7+
sudo: false
88

99
addons:
10-
apt:
11-
sources:
12-
- google-chrome
13-
packages:
14-
- google-chrome-stable
10+
chrome: stable
11+
12+
env:
13+
global:
14+
# See https://git.io/vdao3 for details.
15+
- JOBS=1
1516

1617
cache:
1718
yarn: true
@@ -20,11 +21,11 @@ cache:
2021
- $HOME/.cache
2122

2223
before_install:
23-
- npm config set spin false
24-
- npm install -g bower phantomjs-prebuilt yarn@~0.21.3
25-
- bower --version
26-
- phantomjs --version
27-
- yarn --version
24+
- curl -o- -L https://yarnpkg.com/install.sh | bash
25+
- export PATH=$HOME/.yarn/bin:$PATH
26+
- yarn global add bower
27+
- bower --version
28+
- yarn --version
2829

2930
install:
3031
- yarn

testem.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,11 @@ module.exports = {
99
"launch_in_dev": [
1010
"PhantomJS",
1111
"Chrome"
12-
]
12+
],
13+
"browser_args": {
14+
"Chrome": [
15+
"--disable-gpu",
16+
"--no-sandbox"
17+
]
18+
}
1319
};

tests/helpers/module-for-acceptance.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Ember from 'ember';
33
import startApp from '../helpers/start-app';
44
import destroyApp from '../helpers/destroy-app';
55

6-
const { RSVP: { Promise }, run } = Ember;
6+
const { RSVP: { Promise } } = Ember;
77

88
export default function(name, options = {}) {
99
module(name, {
@@ -16,7 +16,6 @@ export default function(name, options = {}) {
1616
},
1717

1818
afterEach() {
19-
run.cancelTimers();
2019
let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
2120
return Promise.resolve(afterEach).then(() => destroyApp(this.application));
2221
}

0 commit comments

Comments
 (0)