Replace this.render with render.

Author: Robert Jackson

__testfixtures__/ember-qunit-codemod/module-for-component.input.js

@@ -9,6 +9,11 @@ test('it happens', function() {
   this.render(hbs`derp`);
 });
 
+test('it happens with comments', function() {
+  // comments above this.render are preserved
+  this.render(hbs`derp`);
+});
+
 moduleForComponent('foo-bar', 'Unit | Component | FooBar', {
   needs: [],
 });

__testfixtures__/ember-qunit-codemod/module-for-component.output.js

@@ -1,12 +1,17 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest, setupTest } from 'ember-qunit';
+import { setupRenderingTest, setupTest, render } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | FooBar', function(hooks) {
   setupRenderingTest(hooks);
 
   test('it happens', async function() {
-    await this.render(hbs`derp`);
+    await render(hbs`derp`);
+  });
+
+  test('it happens with comments', async function() {
+    // comments above this.render are preserved
+    await render(hbs`derp`);
   });
 });
 

ember-qunit-codemod.js

@@ -50,6 +50,8 @@ function updateToNewEmberQUnitImports(j, root) {
       let importName = p.node.imported.name;
       let mappedName = mapping[importName] || importName;
 
+      // If importName is `moduleForComponent` determine if we need
+      // `setupTest` (unit) or `setupRenderingTest` (integration)
       if (importName === 'moduleForComponent') {
         root
           .find(j.ExpressionStatement, {
@@ -68,11 +70,31 @@ function updateToNewEmberQUnitImports(j, root) {
     // Remove all existing import specifiers
     .remove();
 
+  let renderUsages = findRenderUsages(j, root);
+  if (renderUsages.size() > 0) {
+    specifiers.add('render');
+  }
+
   emberQUnitImports
     .get('specifiers')
     .replace(Array.from(specifiers).map(s => j.importSpecifier(j.identifier(s))));
 }
 
+function findRenderUsages(j, root) {
+  return root.find(j.ExpressionStatement, {
+    expression: {
+      callee: {
+        object: {
+          type: 'ThisExpression',
+        },
+        property: {
+          name: 'render',
+        },
+      },
+    },
+  });
+}
+
 function parseModule(j, p) {
   let calleeName = p.node.expression.callee.name;
   // Find the moduleName and the module's options
@@ -162,22 +184,15 @@ function updateModuleForToNestedModule(j, root) {
     // mark the test function as an async function
     expression.expression.arguments[1].async = true;
 
-    let renderUsage = j(expression).find(j.ExpressionStatement, {
-      expression: {
-        callee: {
-          object: {
-            type: 'ThisExpression',
-          },
-          property: {
-            name: 'render',
-          },
-        },
-      },
-    });
+    let renderUsage = findRenderUsages(j, j(expression));
 
     renderUsage.forEach(p => {
       let expression = p.get('expression');
-      expression.replace(j.awaitExpression(expression.node));
+
+      let awaitExpression = j.awaitExpression(
+        j.callExpression(j.identifier('render'), expression.node.arguments)
+      );
+      expression.replace(awaitExpression);
     });
   }