Skip to content

Commit 523e87f

Browse files
runspiredfivetanley
runspired
authored and
fivetanley
committed
bump to latest ember-cli, run ember init, cleanup post init (emberjs#4536)
1 parent c9d8212 commit 523e87f

11 files changed

+43
-55
lines changed

‎.editorconfig

-14
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

‎.npmignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
.ember-cli
1616
.gitignore
1717
.eslintrc.js
18-
.travis.yml
1918
.watchmanconfig
19+
.travis.yml
2020
bower.json
2121
ember-cli-build.js
2222
testem.js

‎bower.json

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"dependencies": {
55
"ember": "components/ember#release",
66
"ember-cli-shims": "0.1.1",
7-
"ember-cli-test-loader": "0.2.2",
8-
"ember-qunit-notifications": "0.1.0",
97
"pretender": "^0.12.0"
108
},
119
"resolutions": {

‎config/environment.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*jshint node:true*/
2+
'use strict';
3+
4+
module.exports = function(/* environment, appConfig */) {
5+
return { };
6+
};

‎package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"broccoli-file-creator": "^1.0.0",
3131
"broccoli-merge-trees": "^1.0.0",
3232
"chalk": "^1.1.1",
33-
"ember-cli-babel": "^5.1.3",
33+
"ember-cli-babel": "^5.1.6",
3434
"ember-cli-path-utils": "^1.0.0",
3535
"ember-cli-string-utils": "^1.0.0",
3636
"ember-cli-test-info": "^1.0.0",
@@ -46,46 +46,46 @@
4646
},
4747
"devDependencies": {
4848
"bower": "^1.6.5",
49-
"broccoli-asset-rev": "^2.1.2",
49+
"broccoli-asset-rev": "^2.4.2",
5050
"broccoli-concat": "0.0.13",
5151
"broccoli-funnel": "^1.0.0",
5252
"broccoli-stew": "^1.0.1",
5353
"broccoli-string-replace": "^0.1.1",
5454
"broccoli-uglify-sourcemap": "^1.0.1",
5555
"broccoli-yuidoc": "^2.1.0",
56-
"ember-ajax": "0.7.1",
57-
"ember-cli": "2.5.1",
56+
"ember-ajax": "^2.0.1",
57+
"ember-cli": "^2.8.0",
5858
"ember-cli-app-version": "^1.0.0",
5959
"ember-cli-blueprint-test-helpers": "0.11.0",
6060
"ember-cli-dependency-checker": "^1.2.0",
6161
"ember-cli-eslint": "1.3.0",
6262
"ember-cli-htmlbars": "^1.0.3",
63-
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
64-
"ember-cli-inject-live-reload": "^1.3.1",
63+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
64+
"ember-cli-inject-live-reload": "^1.4.0",
6565
"ember-cli-internal-test-helpers": "^0.8.1",
6666
"ember-cli-pretender": "0.6.0",
67-
"ember-cli-qunit": "^1.4.0",
68-
"ember-cli-release": "0.2.3",
67+
"ember-cli-qunit": "^2.1.0",
68+
"ember-cli-release": "^0.2.9",
6969
"ember-cli-sri": "^2.1.0",
70+
"ember-cli-test-loader": "^1.1.0",
7071
"ember-cli-uglify": "^1.2.0",
7172
"ember-dev": "emberjs/ember-dev#bcfb9c3487ec2fd58b932394a15ce16fd9cf7eed",
7273
"ember-disable-prototype-extensions": "^1.1.0",
7374
"ember-disable-proxy-controllers": "^1.0.0",
74-
"ember-export-application-global": "^1.0.3",
75-
"ember-load-initializers": "^0.5.0",
75+
"ember-export-application-global": "^1.0.5",
76+
"ember-load-initializers": "^0.5.1",
7677
"ember-publisher": "0.0.7",
7778
"ember-resolver": "^2.0.3",
78-
"ember-try": "^0.2.5",
7979
"ember-watson": "^0.7.0",
8080
"github": "^0.2.4",
8181
"glob": "5.0.13",
82-
"loader.js": "^4.0.0",
8382
"mocha": "2.4.5",
8483
"mocha-only-detector": "0.0.2",
8584
"phantomjs-prebuilt": "^2.1.12",
8685
"pretender": "1.0.0",
8786
"rimraf": "2.5.2",
88-
"rsvp": "3.2.1"
87+
"rsvp": "3.2.1",
88+
"loader.js": "^4.0.1"
8989
},
9090
"peerDependencies": {
9191
"ember-inflector": "^1.9.4"

‎tests/dummy/app/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99

1010
{{content-for "head"}}
1111

12-
<link rel="stylesheet" href="assets/vendor.css">
13-
<link rel="stylesheet" href="assets/dummy.css">
12+
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13+
<link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
1414

1515
{{content-for "head-footer"}}
1616
</head>
1717
<body>
1818
{{content-for "body"}}
1919

20-
<script src="assets/vendor.js"></script>
21-
<script src="assets/dummy.js"></script>
20+
<script src="{{rootURL}}assets/vendor.js"></script>
21+
<script src="{{rootURL}}assets/dummy.js"></script>
2222

2323
{{content-for "body-footer"}}
2424
</body>

‎tests/dummy/app/router.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import Ember from 'ember';
22
import config from './config/environment';
33

44
const Router = Ember.Router.extend({
5-
location: config.locationType
5+
location: config.locationType,
6+
rootURL: config.rootURL
67
});
78

89
Router.map(function() {

‎tests/dummy/config/environment.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function(environment) {
1010
var ENV = {
1111
modulePrefix: 'dummy',
1212
environment: environment,
13-
baseURL: '/',
13+
rootURL: '/',
1414
locationType: 'auto',
1515
EmberENV: {
1616
FEATURES: featureFlags,
@@ -41,7 +41,6 @@ module.exports = function(environment) {
4141

4242
if (environment === 'test') {
4343
// Testem prefers this...
44-
ENV.baseURL = '/';
4544
ENV.locationType = 'none';
4645

4746
// keep test console output quieter

‎tests/helpers/module-for-acceptance.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { module } from 'qunit';
2+
import Ember from 'ember';
23
import startApp from '../helpers/start-app';
34
import destroyApp from '../helpers/destroy-app';
45

6+
const { RSVP: { Promise } } = Ember;
7+
58
export default function(name, options = {}) {
69
module(name, {
710
beforeEach() {
811
this.application = startApp();
912

1013
if (options.beforeEach) {
11-
options.beforeEach.apply(this, arguments);
14+
return options.beforeEach.apply(this, arguments);
1215
}
1316
},
1417

1518
afterEach() {
16-
if (options.afterEach) {
17-
options.afterEach.apply(this, arguments);
18-
}
19-
20-
destroyApp(this.application);
19+
let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
20+
return Promise.resolve(afterEach).then(() => destroyApp(this.application));
2121
}
2222
});
2323
}

‎tests/helpers/start-app.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import Ember from 'ember';
22
import Application from '../../app';
33
import config from '../../config/environment';
4-
var assign = Ember.assign || Ember.merge;
54

65
export default function startApp(attrs) {
76
let application;
87

9-
let attributes = assign({}, config.APP);
10-
attributes = assign(attributes, attrs); // use defaults, but you can override;
8+
let attributes = Ember.merge({}, config.APP);
9+
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
1110

1211
Ember.run(() => {
1312
application = Application.create(attributes);

‎tests/index.html

+8-9
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
{{content-for "head"}}
1111
{{content-for "test-head"}}
1212

13-
<link rel="stylesheet" href="assets/vendor.css">
14-
<link rel="stylesheet" href="assets/dummy.css">
15-
<link rel="stylesheet" href="assets/test-support.css">
13+
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
14+
<link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
15+
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
1616

1717
{{content-for "head-footer"}}
1818
{{content-for "test-head-footer"}}
@@ -21,12 +21,11 @@
2121
{{content-for "body"}}
2222
{{content-for "test-body"}}
2323

24-
<script src="testem.js" integrity=""></script>
25-
<script src="assets/vendor.js"></script>
26-
<script src="assets/test-support.js"></script>
27-
<script src="assets/dummy.js"></script>
28-
<script src="assets/tests.js"></script>
29-
<script src="assets/test-loader.js"></script>
24+
<script src="{{rootURL}}testem.js" integrity=""></script>
25+
<script src="{{rootURL}}assets/vendor.js"></script>
26+
<script src="{{rootURL}}assets/test-support.js"></script>
27+
<script src="{{rootURL}}assets/dummy.js"></script>
28+
<script src="{{rootURL}}assets/tests.js"></script>
3029

3130
{{content-for "body-footer"}}
3231
{{content-for "test-body-footer"}}

0 commit comments

Comments
 (0)