Merge 1180606 into 25888b3

ember-cli · Apr 13, 2015 · c5adfa3 · c5adfa3
2 parents 25888b3 + 1180606
commit c5adfa3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/blueprints/initializer-test/files/tests/unit/initializers/__name__-test.js b/blueprints/initializer-test/files/tests/unit/initializers/__name__-test.js
@@ -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;
@@ -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);

diff --git a/tests/acceptance/generate-test.js b/tests/acceptance/generate-test.js
@@ -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', {