Merge pull request #43 from rwjblue/handle-all-options

Ensure all options to moduleFor* are handled.

Author: rwjblue

__testfixtures__/ember-qunit-codemod/custom-functions-in-options.input.js

@@ -24,3 +24,23 @@ test('can have two', function(assert) {
   let custom = this.customFunction();
   let other = this.otherThing();
 });
+
+moduleFor('foo:bar', {
+  m3: true,
+});
+
+test('can access', function(assert) {
+  let usesM3 = this.m3;
+});
+
+moduleFor('foo:bar', {
+  m3: true,
+
+  beforeEach() {
+    doStuff();
+  },
+});
+
+test('separate `hooks.beforeEach` than lifecycle hooks', function(assert) {
+  let usesM3 = this.m3;
+});

__testfixtures__/ember-qunit-codemod/custom-functions-in-options.output.js

@@ -33,3 +33,31 @@ module('stuff:here', function(hooks) {
     let other = this.otherThing();
   });
 });
+
+module('foo:bar', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
+    this.m3 = true;
+  });
+
+  test('can access', function(assert) {
+    let usesM3 = this.m3;
+  });
+});
+
+module('foo:bar', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
+    this.m3 = true;
+  });
+
+  hooks.beforeEach(function() {
+    doStuff();
+  });
+
+  test('separate `hooks.beforeEach` than lifecycle hooks', function(assert) {
+    let usesM3 = this.m3;
+  });
+});

ember-qunit-codemod.js

@@ -195,10 +195,6 @@ module.exports = function(file, api, options) {
       return POSSIBLE_MODULES.some(matcher => j.match(nodePath, matcher));
     }
 
-    function isMethod(nodePath) {
-      return j.match(nodePath, { value: { type: 'FunctionExpression' } });
-    }
-
     const LIFE_CYCLE_METHODS = [
       { key: { name: 'before' }, value: { type: 'FunctionExpression' } },
       { key: { name: 'beforeEach' }, value: { type: 'FunctionExpression' } },
@@ -242,7 +238,12 @@ module.exports = function(file, api, options) {
             lifecycleStatement.comments = property.comments;
 
             callback.body.body.push(lifecycleStatement);
-          } else if (isMethod(property)) {
+          } else {
+            const IGNORED_PROPERTIES = ['integration', 'needs', 'unit'];
+            if (IGNORED_PROPERTIES.includes(property.key.name)) {
+              return;
+            }
+
             if (!customMethodBeforeEachBody) {
               customMethodBeforeEachBody = j.blockStatement([]);
               customMethodBeforeEachExpression = j.expressionStatement(