Skip to content

Commit 369144f

Browse files
snewcomermarcoow
authored andcommittedJan 11, 2018
upgrade to 2.18 (mainmatter#1509)
1 parent b3af585 commit 369144f

File tree

8 files changed

+209
-107
lines changed

8 files changed

+209
-107
lines changed
 

‎config/environment.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = function(/* environment, appConfig */) {

‎ember-cli-build.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
/* eslint-env node */
43
/* eslint-disable no-var, object-shorthand */
54

65
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"lint": "eslint app addon blueprints config server test-support tests *.js",
1919
"now-build": "ember build --environment=production",
2020
"now-start": "NODE_ENV=production PORT=8000 node fastboot-server.js",
21-
"start": "ember server",
21+
"start": "ember serve",
2222
"test": "ember test",
2323
"test:all": "ember try:each",
2424
"test:fastboot": "ember fastboot:test",
@@ -49,7 +49,7 @@
4949
"cors": "^2.8.4",
5050
"ember-ajax": "^3.0.0",
5151
"ember-bootstrap": "^1.0.0-beta.2",
52-
"ember-cli": "2.17.2",
52+
"ember-cli": "~2.18.0",
5353
"ember-cli-blueprint-test-helpers": "^0.18.0",
5454
"ember-cli-chai": "^0.4.2",
5555
"ember-cli-content-security-policy": "~1.0.0",
@@ -61,10 +61,10 @@
6161
"ember-cli-inject-live-reload": "^1.6.1",
6262
"ember-cli-mocha": "^0.14.4",
6363
"ember-cli-pretender": "^1.0.1",
64-
"ember-cli-shims": "^1.1.0",
64+
"ember-cli-shims": "^1.2.0",
6565
"ember-cli-sri": "^2.1.1",
6666
"ember-cli-uglify": "^2.0.0",
67-
"ember-data": "^2.14.4",
67+
"ember-data": "^2.18.0",
6868
"ember-debug-handlers-polyfill": "^1.1.0",
6969
"ember-disable-prototype-extensions": "^1.1.2",
7070
"ember-export-application-global": "^2.0.0",

‎testem.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
module.exports = {
32
framework: 'mocha',
43
test_page: 'tests/index.html?hidepassed',
@@ -15,7 +14,7 @@ module.exports = {
1514
args: [
1615
'--disable-gpu',
1716
'--headless',
18-
'--remote-debugging-port=9222',
17+
'--remote-debugging-port=0',
1918
'--window-size=1440,900'
2019
]
2120
},

‎tests/dummy/config/environment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = function(environment) {
@@ -68,6 +67,7 @@ module.exports = function(environment) {
6867
ENV.APP.LOG_VIEW_LOOKUPS = false;
6968

7069
ENV.APP.rootElement = '#ember-testing';
70+
ENV.APP.autoboot = false;
7171
}
7272

7373
if (environment === 'production') {

‎tests/dummy/config/targets.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
module.exports = {
32
browsers: [
43
'ie 9',

‎tests/helpers/start-app.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { run } from '@ember/runloop';
55

66
export default function startApp(attrs) {
77
let attributes = merge({}, config.APP);
8+
attributes.autoboot = true;
89
attributes = merge(attributes, attrs); // use defaults, but you can override;
910

1011
return run(() => {

‎yarn.lock

+202-97
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.