Skip to content

Commit efc1403

Browse files
authored
Merge pull request #868 from bmish/no-invalid-test-waiters-import-fix
Fix false negatives in `no-invalid-test-waiters` rule
2 parents 26821f0 + 09f064d commit efc1403

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lib/rules/no-invalid-test-waiters.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ module.exports = {
4242

4343
return {
4444
ImportDeclaration(node) {
45-
buildWaiter = getImportIdentifier(node, 'ember-test-waiters', 'buildWaiter');
45+
if (node.source.value === 'ember-test-waiters') {
46+
buildWaiter =
47+
buildWaiter || getImportIdentifier(node, 'ember-test-waiters', 'buildWaiter');
48+
}
4649
},
4750

4851
CallExpression(node) {

tests/lib/rules/no-invalid-test-waiters.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ruleTester.run('no-invalid-test-waiters', rule, {
1616
valid: [
1717
`
1818
import { buildWaiter } from 'ember-test-waiters';
19+
import { random } from 'random';
20+
import { somethingElse } from 'ember-test-waiters';
1921
2022
let myWaiter = buildWaiter('waiterName');
2123
`,
@@ -52,6 +54,8 @@ ruleTester.run('no-invalid-test-waiters', rule, {
5254
{
5355
code: `
5456
import { buildWaiter } from 'ember-test-waiters';
57+
import { random } from 'random';
58+
import { somethingElse } from 'ember-test-waiters';
5559
5660
function useWaiter() {
5761
let myOtherWaiter = buildWaiter('the second');

0 commit comments

Comments
 (0)