-
Notifications
You must be signed in to change notification settings - Fork 148
fix(prefer-user-event): format list of userEvent methods correctly #311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,11 +5,11 @@ import { | |
import { createRuleTester } from '../test-utils'; | ||
import { LIBRARY_MODULES } from '../../../lib/utils'; | ||
import rule, { | ||
RULE_NAME, | ||
MAPPING_TO_USER_EVENT, | ||
MessageIds, | ||
Options, | ||
RULE_NAME, | ||
UserEventMethods, | ||
MappingToUserEvent, | ||
} from '../../../lib/rules/prefer-user-event'; | ||
|
||
function createScenarioWithImport< | ||
|
@@ -18,7 +18,7 @@ function createScenarioWithImport< | |
return LIBRARY_MODULES.reduce( | ||
(acc: Array<T>, libraryModule) => | ||
acc.concat( | ||
Object.keys(MappingToUserEvent).map((fireEventMethod) => | ||
Object.keys(MAPPING_TO_USER_EVENT).map((fireEventMethod) => | ||
callback(libraryModule, fireEventMethod) | ||
) | ||
), | ||
|
@@ -28,6 +28,26 @@ function createScenarioWithImport< | |
|
||
const ruleTester = createRuleTester(); | ||
|
||
function formatUserEventMethodsMessage(fireEventMethod: string): string { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I reimplemented here the same method so I don't use the very same implementation. Otherwise, it would be tricky to catch errors formatting the message. |
||
const userEventMethods = MAPPING_TO_USER_EVENT[fireEventMethod].map( | ||
(methodName) => `userEvent.${methodName}` | ||
); | ||
let joinedList = ''; | ||
|
||
for (let i = 0; i < userEventMethods.length; i++) { | ||
const item = userEventMethods[i]; | ||
if (i === 0) { | ||
joinedList += item; | ||
} else if (i + 1 === userEventMethods.length) { | ||
joinedList += `, or ${item}`; | ||
} else { | ||
joinedList += `, ${item}`; | ||
} | ||
} | ||
|
||
return joinedList; | ||
} | ||
|
||
ruleTester.run(RULE_NAME, rule, { | ||
valid: [ | ||
{ | ||
|
@@ -132,7 +152,7 @@ ruleTester.run(RULE_NAME, rule, { | |
userEvent.${userEventMethod}(foo) | ||
`, | ||
})), | ||
...Object.keys(MappingToUserEvent).map((fireEventMethod: string) => ({ | ||
...Object.keys(MAPPING_TO_USER_EVENT).map((fireEventMethod: string) => ({ | ||
settings: { | ||
'testing-library/utils-module': 'test-utils', | ||
}, | ||
|
@@ -143,7 +163,7 @@ ruleTester.run(RULE_NAME, rule, { | |
fireEvent.${fireEventMethod}(foo) | ||
`, | ||
})), | ||
...Object.keys(MappingToUserEvent).map((fireEventMethod: string) => ({ | ||
...Object.keys(MAPPING_TO_USER_EVENT).map((fireEventMethod: string) => ({ | ||
settings: { | ||
'testing-library/utils-module': 'test-utils', | ||
}, | ||
|
@@ -154,7 +174,7 @@ ruleTester.run(RULE_NAME, rule, { | |
`, | ||
options: [{ allowedMethods: [fireEventMethod] }], | ||
})), | ||
...Object.keys(MappingToUserEvent).map((fireEventMethod: string) => ({ | ||
...Object.keys(MAPPING_TO_USER_EVENT).map((fireEventMethod: string) => ({ | ||
settings: { | ||
'testing-library/utils-module': 'test-utils', | ||
}, | ||
|
@@ -165,7 +185,7 @@ ruleTester.run(RULE_NAME, rule, { | |
`, | ||
options: [{ allowedMethods: [fireEventMethod] }], | ||
})), | ||
...Object.keys(MappingToUserEvent).map((fireEventMethod: string) => ({ | ||
...Object.keys(MAPPING_TO_USER_EVENT).map((fireEventMethod: string) => ({ | ||
settings: { | ||
'testing-library/utils-module': 'test-utils', | ||
}, | ||
|
@@ -198,6 +218,10 @@ ruleTester.run(RULE_NAME, rule, { | |
messageId: 'preferUserEvent', | ||
line: 4, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage(fireEventMethod), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
}) | ||
|
@@ -208,7 +232,17 @@ ruleTester.run(RULE_NAME, rule, { | |
import * as dom from '${libraryModule}' | ||
dom.fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage(fireEventMethod), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
}) | ||
), | ||
...createScenarioWithImport<InvalidTestCase<MessageIds, Options>>( | ||
|
@@ -217,7 +251,17 @@ ruleTester.run(RULE_NAME, rule, { | |
const { fireEvent } = require('${libraryModule}') | ||
fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage(fireEventMethod), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
}) | ||
), | ||
...createScenarioWithImport<InvalidTestCase<MessageIds, Options>>( | ||
|
@@ -226,10 +270,20 @@ ruleTester.run(RULE_NAME, rule, { | |
const rtl = require('${libraryModule}') | ||
rtl.fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage(fireEventMethod), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
}) | ||
), | ||
...Object.keys(MappingToUserEvent).map( | ||
...Object.keys(MAPPING_TO_USER_EVENT).map( | ||
(fireEventMethod: string) => | ||
({ | ||
settings: { | ||
|
@@ -239,10 +293,22 @@ ruleTester.run(RULE_NAME, rule, { | |
import * as dom from 'test-utils' | ||
dom.fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage( | ||
fireEventMethod | ||
), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
} as const) | ||
), | ||
...Object.keys(MappingToUserEvent).map( | ||
...Object.keys(MAPPING_TO_USER_EVENT).map( | ||
(fireEventMethod: string) => | ||
({ | ||
settings: { | ||
|
@@ -252,10 +318,22 @@ ruleTester.run(RULE_NAME, rule, { | |
import { fireEvent } from 'test-utils' | ||
fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage( | ||
fireEventMethod | ||
), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
} as const) | ||
), | ||
...Object.keys(MappingToUserEvent).map( | ||
...Object.keys(MAPPING_TO_USER_EVENT).map( | ||
(fireEventMethod: string) => | ||
({ | ||
code: ` | ||
|
@@ -264,10 +342,22 @@ ruleTester.run(RULE_NAME, rule, { | |
import { fireEvent } from 'test-utils' | ||
fireEvent.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 5, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 5, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage( | ||
fireEventMethod | ||
), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
} as const) | ||
), | ||
...Object.keys(MappingToUserEvent).map( | ||
...Object.keys(MAPPING_TO_USER_EVENT).map( | ||
(fireEventMethod: string) => | ||
({ | ||
settings: { | ||
|
@@ -277,14 +367,27 @@ ruleTester.run(RULE_NAME, rule, { | |
import { fireEvent as fireEventAliased } from 'test-utils' | ||
fireEventAliased.${fireEventMethod}(foo) | ||
`, | ||
errors: [{ messageId: 'preferUserEvent', line: 3, column: 9 }], | ||
errors: [ | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 3, | ||
column: 9, | ||
data: { | ||
userEventMethods: formatUserEventMethodsMessage( | ||
fireEventMethod | ||
), | ||
fireEventMethod: fireEventMethod, | ||
}, | ||
}, | ||
], | ||
} as const) | ||
), | ||
{ | ||
code: ` // simple test to check error in detail | ||
import { fireEvent } from '@testing-library/react' | ||
|
||
fireEvent.click(element) | ||
fireEvent.mouseOut(element) | ||
`, | ||
errors: [ | ||
{ | ||
|
@@ -295,10 +398,21 @@ ruleTester.run(RULE_NAME, rule, { | |
endColumn: 22, | ||
data: { | ||
userEventMethods: | ||
'userEvent.click(), userEvent.type() or userEvent.deselectOptions()', | ||
'userEvent.click, userEvent.type, userEvent.selectOptions, or userEvent.deselectOptions', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @epmatsw nice catch opening this issue! This test should have caught that, but had the wrong expected output :( |
||
fireEventMethod: 'click', | ||
}, | ||
}, | ||
{ | ||
messageId: 'preferUserEvent', | ||
line: 5, | ||
endLine: 5, | ||
column: 7, | ||
endColumn: 25, | ||
data: { | ||
userEventMethods: 'userEvent.unhover', | ||
fireEventMethod: 'mouseOut', | ||
}, | ||
}, | ||
], | ||
}, | ||
], | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to just use
Intl.ListFormat
here, but it's available from node v13 so we can't stick to it until we drop node v10 and node v12 compatibility 😅