Skip to content

Commit 577c62c

Browse files
committed
upgrade to 3.0
1 parent c3c4942 commit 577c62c

4 files changed

Lines changed: 126 additions & 173 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"chai-fs": "^2.0.0",
4646
"co": "^4.6.0",
4747
"ember-ajax": "^3.0.0",
48-
"ember-cli": "~2.18.0",
48+
"ember-cli": "~3.0.0",
4949
"ember-cli-addon-tests": "^0.11.0",
5050
"ember-cli-dependency-checker": "^2.0.1",
5151
"ember-cli-eslint": "^4.2.1",
@@ -62,7 +62,7 @@
6262
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
6363
"ember-resolver": "^4.3.0",
6464
"ember-sinon": "^1.0.0",
65-
"ember-source": "~2.18.0",
65+
"ember-source": "~3.0.0",
6666
"eslint-plugin-ember": "^5.0.0",
6767
"eslint-plugin-node": "^5.2.1",
6868
"glob": "^7.0.0",

testem.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ module.exports = {
1111
Chrome: {
1212
mode: 'ci',
1313
args: [
14+
// --no-sandbox is needed when running Chrome inside a container
15+
process.env.TRAVIS ? '--no-sandbox' : null,
16+
1417
'--disable-gpu',
1518
'--headless',
16-
'--no-sandbox',
1719
'--remote-debugging-port=0',
1820
'--window-size=1440,900'
19-
]
21+
].filter(Boolean)
2022
}
2123
}
2224
};

tests/dummy/config/targets.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
const browsers = [
2+
'last 1 Chrome versions',
3+
'last 1 Firefox versions',
4+
'last 1 Safari versions'
5+
];
6+
7+
const isCI = !!process.env.CI;
8+
const isProduction = process.env.EMBER_ENV === 'production';
9+
10+
if (isCI || isProduction) {
11+
browsers.push('ie 11');
12+
}
13+
114
module.exports = {
2-
browsers: [
3-
'ie 9',
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
]
15+
browsers
816
};

0 commit comments

Comments
 (0)