Skip to content

Commit

Permalink
Merge 1180606 into 25888b3
Browse files Browse the repository at this point in the history
  • Loading branch information
marcioj committed Apr 13, 2015
2 parents 25888b3 + 1180606 commit c5adfa3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import { initialize } from '../../../initializers/<%= dasherizedModuleName %>';
import initializer from '../../../initializers/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

var container, application;
Expand All @@ -16,7 +16,7 @@ module('<%= classifiedModuleName %>Initializer', {

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

// you would normally confirm the results of the initializer here
assert.ok(true);
Expand Down
11 changes: 11 additions & 0 deletions tests/acceptance/generate-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,17 @@ describe('Acceptance: ember generate', function() {
});
});

it('initializer-test foo', function() {
return generate(['initializer-test', 'foo']).then(function() {
assertFile('tests/unit/initializers/foo-test.js', {
contains: [
"import initializer from '../../../initializers/foo';",
"initializer.initialize(container, application);"
]
});
});
});

it('mixin foo', function() {
return generate(['mixin', 'foo']).then(function() {
assertFile('app/mixins/foo.js', {
Expand Down

0 comments on commit c5adfa3

Please sign in to comment.