Skip to content

Commit 793465c

Browse files
author
David Tang
committed
upgrade to Ember/Ember CLI to 2.15
1 parent e074639 commit 793465c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
"ember-ajax": "^3.0.0",
3333
"ember-changeset": "^1.3.0",
3434
"ember-changeset-validations": "^1.2.8",
35-
"ember-cli": "~2.14.1",
36-
"ember-cli-dependency-checker": "^1.3.0",
35+
"ember-cli": "~2.15.1",
36+
"ember-cli-dependency-checker": "^2.0.0",
3737
"ember-cli-eslint": "^3.0.0",
3838
"ember-cli-htmlbars": "^2.0.1",
39-
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
39+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
4040
"ember-cli-inject-live-reload": "^1.4.1",
4141
"ember-cli-qunit": "^4.0.0",
4242
"ember-cli-shims": "^1.1.0",
@@ -47,7 +47,7 @@
4747
"ember-load-initializers": "^1.0.0",
4848
"ember-resolver": "^4.0.0",
4949
"ember-sinon": "^0.7.0",
50-
"ember-source": "~2.14.1",
50+
"ember-source": "~2.15.0",
5151
"loader.js": "^4.2.3"
5252
},
5353
"engines": {

testem.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ module.exports = {
33
test_page: 'tests/index.html?hidepassed',
44
disable_watching: true,
55
launch_in_ci: [
6-
'PhantomJS'
6+
'Chrome'
77
],
88
launch_in_dev: [
9-
'PhantomJS',
109
'Chrome'
11-
]
10+
],
11+
browser_args: {
12+
Chrome: [
13+
'--disable-gpu',
14+
'--headless',
15+
'--remote-debugging-port=9222',
16+
'--window-size=1440,900'
17+
]
18+
}
1219
};

0 commit comments

Comments
 (0)