Merge pull request #17732 from simonihmig/fix-initializer-blueprint

Fix initializer blueprint for ember-mocha 0.14
emberjs · Mar 14, 2019 · 099aaa5 · 099aaa5
2 parents 1cd2e8e + 1aa9239
commit 099aaa5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...ints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/...ints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
-import { describe, it } from 'mocha';
+import { describe, it, beforeEach, afterEach } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 describe('<%= friendlyTestName %>', function() {
-  hooks.beforeEach(function() {
+  beforeEach(function() {
     this.TestApplication = Application.extend();
     this.TestApplication.initializer({
       name: 'initializer under test',
@@ -16,7 +16,7 @@ describe('<%= friendlyTestName %>', function() {
     this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  hooks.afterEach(function() {
+  afterEach(function() {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 

diff --git a/node-tests/fixtures/initializer-test/mocha-rfc232.js b/node-tests/fixtures/initializer-test/mocha-rfc232.js
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
-import { describe, it } from 'mocha';
+import { describe, it, beforeEach, afterEach } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
 import { run } from '@ember/runloop';
 
 describe('Unit | Initializer | foo', function() {
-  hooks.beforeEach(function() {
+  beforeEach(function() {
     this.TestApplication = Application.extend();
     this.TestApplication.initializer({
       name: 'initializer under test',
@@ -16,7 +16,7 @@ describe('Unit | Initializer | foo', function() {
     this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  hooks.afterEach(function() {
+  afterEach(function() {
     run(this.application, 'destroy');
   });
 

diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
-import { describe, it } from 'mocha';
+import { describe, it, beforeEach, afterEach } from 'mocha';
 import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from 'my-app/init/initializers/foo';
 import { run } from '@ember/runloop';
 
 describe('Unit | Initializer | foo', function() {
-  hooks.beforeEach(function() {
+  beforeEach(function() {
     this.TestApplication = Application.extend();
     this.TestApplication.initializer({
       name: 'initializer under test',
@@ -16,7 +16,7 @@ describe('Unit | Initializer | foo', function() {
     this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  hooks.afterEach(function() {
+  afterEach(function() {
     run(this.application, 'destroy');
   });