Merge pull request #44 from rwjblue/only-update-imported-wait

Modify `wait` rewriting to be more intelligent.

Author: rwjblue

__testfixtures__/ember-qunit-codemod/global-wait.input.js

@@ -0,0 +1,10 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
+
+moduleForAcceptance('something');
+
+test('uses global helpers', function(assert) {
+  visit('/something');
+
+  wait().then(() => assert.ok(true));
+});

__testfixtures__/ember-qunit-codemod/global-wait.output.js

@@ -0,0 +1,10 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
+
+moduleForAcceptance('something');
+
+test('uses global helpers', function(assert) {
+  visit('/something');
+
+  wait().then(() => assert.ok(true));
+});

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

@@ -1,4 +1,5 @@
 import { moduleForComponent, test } from 'ember-qunit';
+import wait from 'ember-test-helpers/wait';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('foo-bar', 'Integration | Component | FooBar', {
@@ -68,5 +69,7 @@ moduleForComponent('foo-bar', 'Integration | Component | FooBar', {
 });
 
 test('can use render in custom method', function (assert) {
-  assert.equal(this._element.textContent, 'derp');
+  return wait().then(() => {
+    assert.equal(this._element.textContent, 'derp');
+  });
 });

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

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest, setupTest } from 'ember-qunit';
-import { clearRender, render } from 'ember-test-helpers';
+import { clearRender, render, settled } from 'ember-test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | FooBar', function(hooks) {
@@ -71,6 +71,8 @@ module('Integration | Component | FooBar', function(hooks) {
   });
 
   test('can use render in custom method', function (assert) {
-    assert.equal(this.element.textContent, 'derp');
+    return settled().then(() => {
+      assert.equal(this.element.textContent, 'derp');
+    });
   });
 });

ember-qunit-codemod.js

@@ -2,6 +2,22 @@ module.exports = function(file, api, options) {
   const j = api.jscodeshift;
   const root = j(file.source);
 
+  function ensureImportWithSpecifiers({ source, specifiers, anchor, positionMethod }) {
+    let importStatement = ensureImport(source, anchor, positionMethod);
+    let combinedSpecifiers = new Set(specifiers);
+
+    importStatement
+      .find(j.ImportSpecifier)
+      .forEach(i => combinedSpecifiers.add(i.node.imported.name))
+      .remove();
+
+    importStatement.get('specifiers').replace(
+      Array.from(combinedSpecifiers)
+        .sort()
+        .map(s => j.importSpecifier(j.identifier(s)))
+    );
+  }
+
   function ensureImport(source, anchor, method = 'insertAfter') {
     let desiredImport = root.find(j.ImportDeclaration, { source: { value: source } });
     if (desiredImport.size() > 0) {
@@ -41,14 +57,12 @@ module.exports = function(file, api, options) {
       return;
     }
 
-    let qunitImports = ensureImport('qunit', 'ember-qunit', 'insertBefore');
-    qunitImports.find(j.ImportSpecifier).forEach(p => specifiers.add(p.node.imported.name));
-
-    qunitImports.get('specifiers').replace(
-      Array.from(specifiers)
-        .sort()
-        .map(s => j.importSpecifier(j.identifier(s)))
-    );
+    ensureImportWithSpecifiers({
+      source: 'qunit',
+      anchor: 'ember-qunit',
+      positionMethod: 'insertBefore',
+      specifiers,
+    });
   }
 
   function updateToNewEmberQUnitImports() {
@@ -97,9 +111,6 @@ module.exports = function(file, api, options) {
 
   function updateEmberTestHelperImports() {
     let specifiers = new Set();
-    let emberTestHelpersImport = root.find(j.ImportDeclaration, {
-      source: { value: 'ember-test-helpers' },
-    });
 
     ['render', 'clearRender'].forEach(type => {
       let usages = findTestHelperUsageOf(root, type);
@@ -108,31 +119,12 @@ module.exports = function(file, api, options) {
       }
     });
 
-    root
-      .find(j.ImportDeclaration, { source: { value: 'ember-test-helpers/wait' } })
-      .forEach(p => {
-        specifiers.add('settled');
-        return p;
-      })
-      .remove();
-
     if (specifiers.size > 0) {
-      if (emberTestHelpersImport.size() > 0) {
-        // collect existing imports
-        emberTestHelpersImport
-          .find(j.ImportSpecifier)
-          .forEach(p => specifiers.add(p.node.imported.name))
-          .remove();
-      } else {
-        // Add new `import from 'ember-test-helpers'` node
-        emberTestHelpersImport = ensureImport('ember-test-helpers', 'ember-qunit');
-      }
-
-      emberTestHelpersImport.get('specifiers').replace(
-        Array.from(specifiers)
-          .sort()
-          .map(s => j.importSpecifier(j.identifier(s)))
-      );
+      ensureImportWithSpecifiers({
+        source: 'ember-test-helpers',
+        anchor: 'ember-qunit',
+        specifiers,
+      });
     }
   }
 
@@ -548,10 +540,27 @@ module.exports = function(file, api, options) {
       .forEach(replacement);
   }
 
-  function updateWaitCalls() {
-    root.find(j.CallExpression, { callee: { name: 'wait' } }).forEach(p => {
-      p.node.callee.name = 'settled';
+  function updateWaitUsage() {
+    let waitImport = root.find(j.ImportDeclaration, {
+      source: { value: 'ember-test-helpers/wait' },
     });
+
+    if (waitImport.size() > 0) {
+      let importedName;
+
+      ensureImportWithSpecifiers({
+        source: 'ember-test-helpers',
+        anchor: 'ember-qunit',
+        specifiers: ['settled'],
+      });
+
+      waitImport.find(j.ImportDefaultSpecifier).forEach(p => (importedName = p.node.local.name));
+      waitImport.remove();
+
+      root.find(j.CallExpression, { callee: { name: importedName } }).forEach(p => {
+        p.node.callee.name = 'settled';
+      });
+    }
   }
 
   const printOptions = options.printOptions || { quote: 'single' };
@@ -567,8 +576,9 @@ module.exports = function(file, api, options) {
     updateInjectCalls();
   } else {
     updateEmberTestHelperImports();
-    updateWaitCalls();
   }
 
+  updateWaitUsage();
+
   return root.toSource(printOptions);
 };