Avoid transforming this.subject when custom this.subject is present.

Author: Robert Jackson

ember-qunit-codemod.js

@@ -104,7 +104,7 @@ module.exports = function(file, api, options) {
   function parseModule(p) {
     let calleeName = p.node.expression.callee.name;
     // Find the moduleName and the module's options
-    let moduleName, subject, options;
+    let moduleName, subject, options, hasCustomSubject;
     let calleeArguments = p.node.expression.arguments.slice();
     let lastArgument = calleeArguments[calleeArguments.length - 1];
     if (lastArgument.type === 'ObjectExpression') {
@@ -127,9 +127,11 @@ module.exports = function(file, api, options) {
       } else if (!hasIntegration) {
         subject = calleeArguments[0];
       }
+
+      hasCustomSubject = options.properties.some(p => p.key.name === 'subject');
     }
 
-    return [moduleName, options, setupIdentifier, subject];
+    return [moduleName, options, setupIdentifier, subject, hasCustomSubject];
   }
 
   function updateModuleForToNestedModule() {
@@ -155,7 +157,7 @@ module.exports = function(file, api, options) {
     }
 
     function createModule(p) {
-      let [moduleName, options, setupType, subject] = parseModule(p);
+      let [moduleName, options, setupType, subject, hasCustomSubject] = parseModule(p);
 
       // Create the new `module(moduleName, function(hooks) {});` invocation
       let callback = j.functionExpression(
@@ -186,7 +188,7 @@ module.exports = function(file, api, options) {
         });
       }
 
-      return [moduleInvocation, callback.body.body, setupType, subject];
+      return [moduleInvocation, callback.body.body, setupType, subject, hasCustomSubject];
     }
 
     function processRenderingTest(testExpression) {
@@ -301,7 +303,7 @@ module.exports = function(file, api, options) {
     let bodyPath = programPath.get('body');
 
     let bodyReplacement = [];
-    let currentModuleCallbackBody, currentTestType, currentSubject;
+    let currentModuleCallbackBody, currentTestType, currentSubject, currentHasCustomSubject;
     bodyPath.each(expressionPath => {
       let expression = expressionPath.node;
       if (isModuleDefinition(expressionPath)) {
@@ -310,12 +312,13 @@ module.exports = function(file, api, options) {
         currentModuleCallbackBody = result[1];
         currentTestType = result[2];
         currentSubject = result[3];
+        currentHasCustomSubject = result[4];
       } else if (currentModuleCallbackBody) {
         currentModuleCallbackBody.push(expression);
 
         if (currentTestType === 'setupRenderingTest') {
           processRenderingTest(expression);
-        } else if (currentTestType === 'setupTest') {
+        } else if (currentTestType === 'setupTest' && !currentHasCustomSubject) {
           processSubject(expression, currentSubject);
         }
       } else {