Skip to content

Commit ac2d7ac

Browse files
committed
Merge remote-tracking branch 'origin/master' into v4
# Conflicts: # README.md
2 parents d8a2ac6 + edf9e66 commit ac2d7ac

File tree

4 files changed

+40
-7
lines changed

4 files changed

+40
-7
lines changed

.all-contributorsrc

+19
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,25 @@
263263
"code",
264264
"test"
265265
]
266+
},
267+
{
268+
"login": "nickmccurdy",
269+
"name": "Nick McCurdy",
270+
"avatar_url": "https://avatars0.githubusercontent.com/u/927220?v=4",
271+
"profile": "https://nickmccurdy.com/",
272+
"contributions": [
273+
"ideas",
274+
"code"
275+
]
276+
},
277+
{
278+
"login": "stefcameron",
279+
"name": "Stefan Cameron",
280+
"avatar_url": "https://avatars3.githubusercontent.com/u/2855350?v=4",
281+
"profile": "https://stefancameron.com/",
282+
"contributions": [
283+
"bug"
284+
]
266285
}
267286
],
268287
"contributorsPerLine": 7,

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
2626

27-
[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-)
27+
[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
2828

2929
<!-- ALL-CONTRIBUTORS-BADGE:END -->
3030

@@ -209,6 +209,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
209209
<td align="center"><a href="https://xxxl.digital/"><img src="https://avatars2.githubusercontent.com/u/42043025?v=4" width="100px;" alt=""/><br /><sub><b>Miguel Erja González</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/issues?q=author%3Amiguelerja" title="Bug reports">🐛</a></td>
210210
<td align="center"><a href="http://pustovalov.dev"><img src="https://avatars2.githubusercontent.com/u/1568885?v=4" width="100px;" alt=""/><br /><sub><b>Pavel Pustovalov</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/issues?q=author%3Apustovalov" title="Bug reports">🐛</a></td>
211211
<td align="center"><a href="https://github.com/jrparish"><img src="https://avatars3.githubusercontent.com/u/5173987?v=4" width="100px;" alt=""/><br /><sub><b>Jacob Parish</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/issues?q=author%3Ajrparish" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=jrparish" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=jrparish" title="Tests">⚠️</a></td>
212+
<td align="center"><a href="https://nickmccurdy.com/"><img src="https://avatars0.githubusercontent.com/u/927220?v=4" width="100px;" alt=""/><br /><sub><b>Nick McCurdy</b></sub></a><br /><a href="#ideas-nickmccurdy" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=nickmccurdy" title="Code">💻</a></td>
213+
<td align="center"><a href="https://stefancameron.com/"><img src="https://avatars3.githubusercontent.com/u/2855350?v=4" width="100px;" alt=""/><br /><sub><b>Stefan Cameron</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/issues?q=author%3Astefcameron" title="Bug reports">🐛</a></td>
212214
</tr>
213215
</table>
214216

lib/rules/no-debug.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
isLiteral,
99
isAwaitExpression,
1010
isMemberExpression,
11+
isImportSpecifier,
1112
} from '../node-utils';
1213

1314
export const RULE_NAME = 'no-debug';
@@ -141,12 +142,11 @@ export default ESLintUtils.RuleCreator(getDocsUrl)({
141142
},
142143
// checks if import has shape:
143144
// import { screen } from '@testing-library/dom';
144-
'ImportDeclaration ImportSpecifier'(node: TSESTree.ImportSpecifier) {
145-
const importDeclarationNode = node.parent as TSESTree.ImportDeclaration;
146-
147-
if (!hasTestingLibraryImportModule(importDeclarationNode)) return;
148-
149-
hasImportedScreen = node.imported.name === 'screen';
145+
ImportDeclaration(node: TSESTree.ImportDeclaration) {
146+
if (!hasTestingLibraryImportModule(node)) return;
147+
hasImportedScreen = node.specifiers.some(
148+
s => isImportSpecifier(s) && s.imported.name === 'screen'
149+
);
150150
},
151151
// checks if import has shape:
152152
// import * as dtl from '@testing-library/dom';

tests/lib/rules/no-debug.test.ts

+12
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ ruleTester.run(RULE_NAME, rule, {
202202
},
203203
],
204204
},
205+
{
206+
// https://github.com/testing-library/eslint-plugin-testing-library/issues/174
207+
code: `
208+
import { screen, render } from '@testing-library/dom'
209+
screen.debug()
210+
`,
211+
errors: [
212+
{
213+
messageId: 'noDebug',
214+
},
215+
],
216+
},
205217
{
206218
code: `
207219
import * as dtl from '@testing-library/dom';

0 commit comments

Comments
 (0)