From d17cdbfa11cf5463c7230e5c7b64a99ec49651ec Mon Sep 17 00:00:00 2001
From: Charles Lowell <cowboyd@frontside.io>
Date: Tue, 15 Sep 2015 10:17:04 -0500
Subject: [PATCH 1/2] `beforeEach` now implies an `Ember.run`

Updates the blueprint to remove unecessary `Ember.run`. Also, extracts
the `visit` into its own beforeEach in order to follow the style of
having side-effects in setup blocks, and assertions in `it` blocks.
---
 .../files/tests/acceptance/__name__-test.js            | 10 +++++-----
 blueprints/ember-cli-mocha/index.js                    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
index fefcf5e..9278c5f 100644
--- a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
@@ -17,14 +17,14 @@ describe('Acceptance: <%= classifiedModuleName %>', function() {
   });
 
   afterEach(function() {
-    Ember.run(application, 'destroy');
+    application.destroy();
   });
 
-  it('can visit /<%= dasherizedModuleName %>', function() {
+  beforeEach(function() {
     visit('/<%= dasherizedModuleName %>');
+  });
 
-    andThen(function() {
-      expect(currentPath()).to.equal('<%= dasherizedModuleName %>');
-    });
+  it('can visit /<%= dasherizedModuleName %>', function() {
+    expect(currentPath()).to.equal('<%= dasherizedModuleName %>');
   });
 });
diff --git a/blueprints/ember-cli-mocha/index.js b/blueprints/ember-cli-mocha/index.js
index 47cfac1..28732c9 100644
--- a/blueprints/ember-cli-mocha/index.js
+++ b/blueprints/ember-cli-mocha/index.js
@@ -13,7 +13,7 @@ module.exports = {
     var addonContext = this;
 
     return this.addBowerPackagesToProject([
-      { name: 'ember-mocha',           source: 'ember-mocha',                     target: '~0.8.0' },
+      { name: 'ember-mocha',           source: 'ember-mocha',                     target: '~0.8.3' },
       { name: 'ember-cli-test-loader', source: 'ember-cli/ember-cli-test-loader', target: '0.1.3'  },
       { name: 'ember-cli-shims',       source: 'ember-cli/ember-cli-shims',       target: '0.0.3'  }
     ]).then(function() {

From 163dcca43f07d0da6d5c4f8e5d629510649b08ae Mon Sep 17 00:00:00 2001
From: Charles Lowell <cowboyd@frontside.io>
Date: Tue, 15 Sep 2015 15:05:29 -0500
Subject: [PATCH 2/2] move application from a closure to an instance var

---
 .../acceptance-test/files/tests/acceptance/__name__-test.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
index 9278c5f..7343292 100644
--- a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
@@ -10,14 +10,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 
 describe('Acceptance: <%= classifiedModuleName %>', function() {
-  var application;
-
   beforeEach(function() {
-    application = startApp();
+    this.application = startApp();
   });
 
   afterEach(function() {
-    application.destroy();
+    this.application.destroy();
   });
 
   beforeEach(function() {