Skip to content

Commit

Permalink
Upgrade to ember-cli 0.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
vine77 committed Apr 17, 2015
1 parent 614622b commit a7f0631
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 18 deletions.
14 changes: 7 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "bf-nav",
"dependencies": {
"jquery": "^1.11.1",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.16",
"ember-resolver": "~0.1.14",
"loader.js": "ember-cli/loader.js#3.2.0",
"ember": "1.11.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.2.8",
"ember-data": "1.0.0-beta.16.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.1",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
}
}
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test"
"test": "ember try:testall"
},
"repository": "",
"engines": {
Expand All @@ -19,23 +19,25 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "0.2.1",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.9",
"ember-cli-qunit": "0.3.10",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.16",
"ember-export-application-global": "^1.0.2"
"ember-data": "1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-try": "0.0.4"
},
"keywords": [
"ember-addon"
],
"dependencies": {
"ember-cli-babel": "^4.0.0",
"ember-cli-htmlbars": "0.7.4"
"ember-cli-htmlbars": "0.7.4",
"ember-cli-babel": "^5.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
4 changes: 3 additions & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

var App;

Ember.MODEL_FACTORY_INJECTIONS = true;

var App = Ember.Application.extend({
App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Expand Down
4 changes: 1 addition & 3 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ var Router = Ember.Router.extend({
location: config.locationType
});

Router.map(function() {
export default Router.map(function() {
});

export default Router;
21 changes: 21 additions & 0 deletions tests/unit/components/bf-nav-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {
moduleForComponent,
test
} from 'ember-qunit';

moduleForComponent('bf-nav', {
// specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});

test('it renders', function(assert) {
assert.expect(2);

// creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');

// renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});
23 changes: 23 additions & 0 deletions tests/unit/initializers/bf-nav-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import Ember from 'ember';
import { initialize } from '../../../initializers/bf-nav';
import { module, test } from 'qunit';

var container, application;

module('BfNavInitializer', {
beforeEach: function() {
Ember.run(function() {
application = Ember.Application.create();
container = application.__container__;
application.deferReadiness();
});
}
});

// Replace this with your real tests.
test('it works', function(assert) {
initialize(container, application);

// you would normally confirm the results of the initializer here
assert.ok(true);
});

0 comments on commit a7f0631

Please sign in to comment.