Fix this.subject replacement for moduleFor + integration: true.

Author: Robert Jackson

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

@@ -81,5 +81,13 @@ test('can use service', function (assert) {
 moduleFor('service:foo');
 
 test('does not require more than one argument', function(assert) {
-  let suject = this.subject();
+  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

@@ -87,6 +87,14 @@ module('service:foo', function(hooks) {
   setupTest(hooks);
 
   test('does not require more than one argument', function(assert) {
-    let subject = this.owner.factoryFor('component:foo-bar').create();
+    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

@@ -110,7 +110,8 @@ module.exports = function(file, api, options) {
     if (lastArgument.type === 'ObjectExpression') {
       options = calleeArguments.pop();
     }
-    subject = moduleName = calleeArguments[1] || calleeArguments[0];
+    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');