Merge pull request #23 from rwjblue/subject-in-before-each

Ensure `this.subject` is processed in beforeEach.

Author: rwjblue

__testfixtures__/ember-qunit-codemod/subject.input.js

@@ -65,3 +65,15 @@ moduleFor('service:foo', {
 test('can use custom subject', function(assert) {
   let subject = this.subject();
 });
+
+moduleFor('service:foo', 'Unit | Service | Foo', {
+  unit: true,
+
+  beforeEach() {
+    this.service = this.subject();
+  }
+});
+
+test('can use service', function (assert) {
+  this.servicer.something();
+});

__testfixtures__/ember-qunit-codemod/subject.output.js

@@ -70,3 +70,15 @@ module('service:foo', function(hooks) {
     let subject = this.subject();
   });
 });
+
+module('Unit | Service | Foo', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
+    this.service = this.owner.lookup('service:foo');
+  });
+
+  test('can use service', function (assert) {
+    this.servicer.something();
+  });
+});

ember-qunit-codemod.js

@@ -188,7 +188,6 @@ module.exports = function(file, api, options) {
 
             // preserve any comments that were present
             lifecycleStatement.comments = property.comments;
-            processExpressionForRenderingTest(lifecycleStatement);
 
             callback.body.body.push(lifecycleStatement);
           } else if (isMethod(property)) {
@@ -227,8 +226,10 @@ module.exports = function(file, api, options) {
           }
         });
 
-        if (customMethodBeforeEachExpression) {
-          processExpressionForRenderingTest(customMethodBeforeEachExpression);
+        if (setupType === 'setupRenderingTest') {
+          processExpressionForRenderingTest(callback);
+        } else {
+          processSubject(callback, subject);
         }
       }