Merge pull request #26 from rwjblue/prevent-errors-with-single-arg

Fix various issues with `subject` detection.

Author: rwjblue

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

@@ -77,3 +77,17 @@ moduleFor('service:foo', 'Unit | Service | Foo', {
 test('can use service', function (assert) {
   this.service.something();
 });
+
+moduleFor('service:foo');
+
+test('does not require more than one argument', function(assert) {
+  let subject = this.subject();
+});
+
+moduleFor('service:foo', {
+  integration: true
+});
+
+test('can use subject in moduleFor + integration: true', function(assert) {
+  let subject = this.subject();
+});

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

@@ -82,3 +82,19 @@ module('Unit | Service | Foo', function(hooks) {
     this.service.something();
   });
 });
+
+module('service:foo', function(hooks) {
+  setupTest(hooks);
+
+  test('does not require more than one argument', function(assert) {
+    let subject = this.owner.lookup('service:foo');
+  });
+});
+
+module('service:foo', function(hooks) {
+  setupTest(hooks);
+
+  test('can use subject in moduleFor + integration: true', function(assert) {
+    let subject = this.owner.lookup('service:foo');
+  });
+});

ember-qunit-codemod.js

@@ -111,6 +111,7 @@ module.exports = function(file, api, options) {
       options = calleeArguments.pop();
     }
     moduleName = calleeArguments[1] || calleeArguments[0];
+    subject = calleeArguments[0];
 
     let setupIdentifier = 'setupTest';
     if (options) {
@@ -119,13 +120,12 @@ module.exports = function(file, api, options) {
       if (calleeName === `moduleForComponent`) {
         if (hasIntegration) {
           setupIdentifier = 'setupRenderingTest';
+          subject = null;
         } else {
           subject = j.literal(`component:${calleeArguments[0].value}`);
         }
       } else if (calleeName === 'moduleForModel') {
         subject = j.literal(`model:${calleeArguments[0].value}`);
-      } else if (!hasIntegration) {
-        subject = calleeArguments[0];
       }
 
       hasCustomSubject = options.properties.some(p => p.key.name === 'subject');