prefer-find-by autofix doesn't respect extra code

Plugin version

v5.3.1

ESLint version

v8.14.0

Node.js version

v16.3.0

npm/yarn version

npm v8.9.0

Operating system

macOS v12.3.1

Bug description

The autofix of the rule prefer-find-by doesn’t work correctly when waitFor options are provided, or there is an assertion involved.

Steps to reproduce

1. Providing waitFor options:

   const button = await waitFor(() => screen.getByText('Count is: 0'), {
       timeout: 100,
     })
   

2. There is an assertion involved

   await waitFor(() =>
       expect(
         screen.getByRole('button', { name: 'Count is: 0' }),
       ).toBeInTheDocument(),
     )
   

Error output/screenshots

These are fixed as:

1. Providing waitFor options:

   const button = await screen.findByText('Count is: 0')
   

2. There is an assertion involved

   await screen.findByRole('button', { name: 'Count is: 0' })
   

ESLint configuration

N/A

Rule(s) affected

prefer-find-by

Anything else?

They should be fixed as:

1. Providing waitFor options:

   const button = await screen.findByText('Count is: 0', { timeout: 100 })
   

2. There is an assertion involved

     expect(
       await screen.findByRole('button', { name: 'Count is: 0' }),
     ).toBeInTheDocument(),
   

Do you want to submit a pull request to fix this bug?

Yes

[Belco90]

That’s right, but this is referring to findBy* queries, which is a wrapper over waitFor util + getBy* queries. This is mentioned in the official docs (I should have linked this in the ticket description, my bad):

findBy methods are a combination of getBy queries and waitFor. They accept the waitFor options as the last argument (e.g. await screen.findByText(‘text’, queryOptions, waitForOptions)).

So based on this, we should keep the options found in the waitFor util, and pass them as the last argument to findBy* queries. You can reproduce this with the examples I left in the description: the options disappear.

[Belco90]

Reopening since only the first half is done (GitHub automation closed it, my bad).