Skip to content

Commit 26fbc48

Browse files
committed
Upgrade to ember-cli 0.2.3
1 parent cb747df commit 26fbc48

File tree

6 files changed

+62
-18
lines changed

6 files changed

+62
-18
lines changed

bower.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "bf-grid",
33
"dependencies": {
4-
"jquery": "^1.11.1",
5-
"ember": "1.10.0",
6-
"ember-data": "1.0.0-beta.16",
7-
"ember-resolver": "~0.1.14",
8-
"loader.js": "ember-cli/loader.js#3.2.0",
4+
"ember": "1.11.1",
95
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
106
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
11-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
12-
"ember-qunit": "0.2.8",
7+
"ember-data": "1.0.0-beta.16.1",
8+
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
9+
"ember-qunit": "0.3.1",
1310
"ember-qunit-notifications": "0.0.7",
11+
"ember-resolver": "~0.1.15",
12+
"jquery": "^1.11.1",
13+
"loader.js": "ember-cli/loader.js#3.2.0",
1414
"qunit": "~1.17.1"
1515
}
1616
}

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"start": "ember server",
1111
"build": "ember build",
12-
"test": "ember test"
12+
"test": "ember try:testall"
1313
},
1414
"repository": "",
1515
"engines": {
@@ -19,23 +19,25 @@
1919
"license": "MIT",
2020
"devDependencies": {
2121
"broccoli-asset-rev": "^2.0.2",
22-
"ember-cli": "0.2.1",
22+
"ember-cli": "0.2.3",
2323
"ember-cli-app-version": "0.3.3",
2424
"ember-cli-content-security-policy": "0.4.0",
2525
"ember-cli-dependency-checker": "0.0.8",
2626
"ember-cli-ic-ajax": "0.1.1",
2727
"ember-cli-inject-live-reload": "^1.3.0",
28-
"ember-cli-qunit": "0.3.9",
28+
"ember-cli-qunit": "0.3.10",
2929
"ember-cli-uglify": "1.0.1",
30-
"ember-data": "1.0.0-beta.16",
31-
"ember-export-application-global": "^1.0.2"
30+
"ember-data": "1.0.0-beta.16.1",
31+
"ember-export-application-global": "^1.0.2",
32+
"ember-disable-prototype-extensions": "^1.0.0",
33+
"ember-try": "0.0.4"
3234
},
3335
"keywords": [
3436
"ember-addon"
3537
],
3638
"dependencies": {
37-
"ember-cli-babel": "^4.0.0",
38-
"ember-cli-htmlbars": "0.7.4"
39+
"ember-cli-htmlbars": "0.7.4",
40+
"ember-cli-babel": "^5.0.0"
3941
},
4042
"ember-addon": {
4143
"configPath": "tests/dummy/config"

tests/dummy/app/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
33
import loadInitializers from 'ember/load-initializers';
44
import config from './config/environment';
55

6+
var App;
7+
68
Ember.MODEL_FACTORY_INJECTIONS = true;
79

8-
var App = Ember.Application.extend({
10+
App = Ember.Application.extend({
911
modulePrefix: config.modulePrefix,
1012
podModulePrefix: config.podModulePrefix,
1113
Resolver: Resolver

tests/dummy/app/router.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ var Router = Ember.Router.extend({
55
location: config.locationType
66
});
77

8-
Router.map(function() {
8+
export default Router.map(function() {
99
});
10-
11-
export default Router;
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import {
2+
moduleForComponent,
3+
test
4+
} from 'ember-qunit';
5+
6+
moduleForComponent('bf-col', {
7+
// specify the other units that are required for this test
8+
// needs: ['component:foo', 'helper:bar']
9+
});
10+
11+
test('it renders', function(assert) {
12+
assert.expect(2);
13+
14+
// creates the component instance
15+
var component = this.subject();
16+
assert.equal(component._state, 'preRender');
17+
18+
// renders the component to the page
19+
this.render();
20+
assert.equal(component._state, 'inDOM');
21+
});
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import {
2+
moduleForComponent,
3+
test
4+
} from 'ember-qunit';
5+
6+
moduleForComponent('bf-row', {
7+
// specify the other units that are required for this test
8+
// needs: ['component:foo', 'helper:bar']
9+
});
10+
11+
test('it renders', function(assert) {
12+
assert.expect(2);
13+
14+
// creates the component instance
15+
var component = this.subject();
16+
assert.equal(component._state, 'preRender');
17+
18+
// renders the component to the page
19+
this.render();
20+
assert.equal(component._state, 'inDOM');
21+
});

0 commit comments

Comments
 (0)