Skip to content

Commit 3cc033a

Browse files
committed
text content fix
when rewriting `this.$().text()`: instead of writing `find('*').textContent`, use `this.element.textContent` instead
1 parent 2f16e6c commit 3cc033a

4 files changed

Lines changed: 23 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test('it renders', function(assert) {
1313

1414
this.render(hbs`{{foo-bar}}`);
1515

16-
assert.equal(find('*').textContent.trim(), '');
16+
assert.equal(this.element.textContent.trim(), '');
1717

1818
// Template block usage:
1919
this.render(hbs`
@@ -22,5 +22,5 @@ test('it renders', function(assert) {
2222
{{/foo-barl}}
2323
`);
2424

25-
assert.equal(find('*').textContent.trim(), 'template block text');
25+
assert.equal(this.element.textContent.trim(), 'template block text');
2626
});

transforms/integration/__testfixtures__/text.input.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ test('it renders', function(assert) {
1010

1111
assert.equal(this.$('.foo').text().trim(), '');
1212
});
13+
14+
test('it renders', function(assert) {
15+
this.render(hbs`{{foo-bar}}`);
16+
17+
assert.equal(this.$().text().trim(), '');
18+
});

transforms/integration/__testfixtures__/text.output.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ test('it renders', function(assert) {
1111

1212
assert.equal(find('.foo').textContent.trim(), '');
1313
});
14+
15+
test('it renders', function(assert) {
16+
this.render(hbs`{{foo-bar}}`);
17+
18+
assert.equal(this.element.textContent.trim(), '');
19+
});

transforms/integration/transforms/text.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ const { createFindExpression, isJQuerySelectExpression, addImportStatement, writ
1111
* @returns {*}
1212
*/
1313
function createExpression(j, findArgs) {
14+
if (findArgs.length === 0) {
15+
return j.memberExpression(
16+
j.memberExpression(
17+
j.thisExpression(),
18+
j.identifier('element')
19+
),
20+
j.identifier('textContent')
21+
);
22+
}
1423
return j.memberExpression(
1524
createFindExpression(j, findArgs),
1625
j.identifier('textContent')

0 commit comments

Comments
 (0)