Merge pull request #41 from fivetanley/text-content-fix

Text content fix

Author: simonihmig

transforms/integration/__testfixtures__/default-component-test.output.js

@@ -1,4 +1,3 @@
-import { find } from '@ember/test-helpers';
 import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -13,7 +12,7 @@ test('it renders', function(assert) {
 
   this.render(hbs`{{foo-bar}}`);
 
-  assert.equal(find('*').textContent.trim(), '');
+  assert.equal(this.element.textContent.trim(), '');
 
   // Template block usage:
   this.render(hbs`
@@ -22,5 +21,5 @@ test('it renders', function(assert) {
     {{/foo-barl}}
   `);
 
-  assert.equal(find('*').textContent.trim(), 'template block text');
+  assert.equal(this.element.textContent.trim(), 'template block text');
 });

transforms/integration/__testfixtures__/text.input.js

@@ -10,3 +10,9 @@ test('it renders', function(assert) {
 
   assert.equal(this.$('.foo').text().trim(), '');
 });
+
+test('it renders', function(assert) {
+  this.render(hbs`{{foo-bar}}`);
+
+  assert.equal(this.$().text().trim(), '');
+});

transforms/integration/__testfixtures__/text.output.js

@@ -11,3 +11,9 @@ test('it renders', function(assert) {
 
   assert.equal(find('.foo').textContent.trim(), '');
 });
+
+test('it renders', function(assert) {
+  this.render(hbs`{{foo-bar}}`);
+
+  assert.equal(this.element.textContent.trim(), '');
+});

transforms/integration/transforms/text.js

@@ -11,6 +11,15 @@ const { createFindExpression, isJQuerySelectExpression, addImportStatement, writ
  * @returns {*}
  */
 function createExpression(j, findArgs) {
+  if (findArgs.length === 0) {
+    return j.memberExpression(
+      j.memberExpression(
+        j.thisExpression(),
+        j.identifier('element')
+      ),
+      j.identifier('textContent')
+    );
+  }
   return j.memberExpression(
     createFindExpression(j, findArgs),
     j.identifier('textContent')

transforms/native-dom/__testfixtures__/context-argument.output.js

@@ -1,4 +1,4 @@
-import { find, findAll, visit, click, fillIn } from '@ember/test-helpers';
+import { find, findAll, visit, click } from '@ember/test-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
 

transforms/native-dom/__testfixtures__/double-import.input.js

@@ -1,2 +1,9 @@
 import { click, currentURL } from 'ember-native-dom-helpers';
 import { find, visit } from 'ember-native-dom-helpers';
+
+test('visiting /foo', async function(assert) {
+  await visit('/foo');
+  await click('.foo');
+  assert.ok(find('.foo'));
+  assert.ok(currentURL());
+});

transforms/native-dom/__testfixtures__/double-import.output.js

@@ -1 +1,8 @@
 import { click, currentURL, find, visit } from '@ember/test-helpers';
+
+test('visiting /foo', async function(assert) {
+  await visit('/foo');
+  await click('.foo');
+  assert.ok(find('.foo'));
+  assert.ok(currentURL());
+});

transforms/native-dom/__testfixtures__/prune-import.input.js

@@ -1 +1,3 @@
 import { click } from 'ember-native-dom-helpers';
+
+click('.foo');

transforms/native-dom/__testfixtures__/prune-import.output.js

@@ -1 +1,3 @@
 import { click } from '@ember/test-helpers';
+
+click('.foo');

transforms/utils.js

@@ -360,13 +360,25 @@ function writeImportStatements(j, root) {
       source: { value: '@ember/test-helpers' }
     });
 
+    let actuallyNeedsImport = Array.from(_statementsToImport).filter(methodName => {
+      return root.find(j.CallExpression, {
+        callee: {
+          name: methodName
+        }
+      }).length > 0;
+    });
+
+    if (actuallyNeedsImport.length === 0) {
+      return;
+    }
+
     if (importStatement.length === 0) {
-      importStatement = createImportStatement(j, '@ember/test-helpers', 'default', Array.from(_statementsToImport));
+      importStatement = createImportStatement(j, '@ember/test-helpers', 'default', actuallyNeedsImport);
       body.unshift(importStatement);
     } else {
       let existingSpecifiers = importStatement.get("specifiers");
 
-      _statementsToImport.forEach(name => {
+      actuallyNeedsImport.forEach(name => {
         if (existingSpecifiers.filter(exSp => exSp.value.imported.name === name).length === 0) {
           existingSpecifiers.push(j.importSpecifier(j.identifier(name)));
         }