Skip to content

Commit bfb802e

Browse files
author
Francesco Novy
committed
Remove unecessary files & update travis/testing config
1 parent 3a2d28a commit bfb802e

7 files changed

Lines changed: 55 additions & 143 deletions

File tree

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.jscsrc

Lines changed: 0 additions & 110 deletions
This file was deleted.

.travis.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,42 @@ node_js:
44
- "6"
55

66
sudo: false
7+
dist: trusty
8+
9+
addons:
10+
chrome: stable
711

812
cache:
913
yarn: true
1014

1115
env:
12-
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
13-
- EMBER_TRY_SCENARIO=ember-lts-2.12
14-
- EMBER_TRY_SCENARIO=ember-release
15-
- EMBER_TRY_SCENARIO=ember-beta
16-
- EMBER_TRY_SCENARIO=ember-canary
17-
- EMBER_TRY_SCENARIO=ember-default
18-
- EMBER_TRY_SCENARIO=fastboot
16+
global:
17+
# See https://git.io/vdao3 for details.
18+
- JOBS=1
19+
matrix:
20+
# we recommend new addons test the current and previous LTS
21+
# as well as latest stable release (bonus points to beta/canary)
22+
- EMBER_TRY_SCENARIO=ember-lts-2.12
23+
- EMBER_TRY_SCENARIO=ember-lts-2.16
24+
- EMBER_TRY_SCENARIO=ember-release
25+
- EMBER_TRY_SCENARIO=ember-beta
26+
- EMBER_TRY_SCENARIO=ember-canary
27+
- EMBER_TRY_SCENARIO=ember-default
28+
- EMBER_TRY_SCENARIO=fastboot
1929

2030
matrix:
2131
fast_finish: true
2232
allow_failures:
2333
- env: EMBER_TRY_SCENARIO=ember-canary
2434

2535
before_install:
26-
- npm config set spin false
36+
- curl -o- -L https://yarnpkg.com/install.sh | bash
2737
- export PATH=$HOME/.yarn/bin:$PATH
28-
- yarn global add phantomjs-prebuilt bower
29-
- npm --version
30-
- yarn --version
31-
- bower --version
32-
- phantomjs --version
3338

3439
install:
35-
- yarn install --no-lockfile
40+
- yarn install --no-lockfile --non-interactive
3641

3742
script:
3843
# Usually, it's ok to finish the test scenario without reverting
3944
# to the addon's original dependency state, skipping "cleanup".
40-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
45+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

bower.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

config/ember-try.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* eslint-env node */
21
module.exports = {
2+
useYarn: true,
33
scenarios: [
44
{
55
name: 'ember-lts-2.12',
@@ -9,6 +9,14 @@ module.exports = {
99
}
1010
}
1111
},
12+
{
13+
name: 'ember-lts-2.16',
14+
npm: {
15+
devDependencies: {
16+
'ember-source': '~2.16.0'
17+
}
18+
}
19+
},
1220
{
1321
name: 'ember-release',
1422
bower: {

testem.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
/* eslint-env node */
21
module.exports = {
3-
"test_page": "tests/index.html?hidepassed",
4-
"disable_watching": true,
5-
"launch_in_ci": [
6-
"PhantomJS"
2+
test_page: 'tests/index.html?hidepassed',
3+
disable_watching: true,
4+
launch_in_ci: [
5+
'Chrome'
76
],
8-
"launch_in_dev": [
9-
"PhantomJS",
10-
"Chrome"
11-
]
7+
launch_in_dev: [
8+
'Chrome'
9+
],
10+
browser_args: {
11+
Chrome: {
12+
mode: 'ci',
13+
args: [
14+
'--disable-gpu',
15+
'--headless',
16+
'--remote-debugging-port=0',
17+
'--window-size=1440,900'
18+
]
19+
}
20+
}
1221
};

tests/dummy/config/targets.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
browsers: [
3+
'ie 9',
4+
'last 1 Chrome versions',
5+
'last 1 Firefox versions',
6+
'last 1 Safari versions'
7+
]
8+
};

0 commit comments

Comments
 (0)