Skip to content
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

Add an else condition to correct StubbedMock behavior #1994

Merged

Conversation

corsonknowles
Copy link
Contributor

@corsonknowles corsonknowles commented Nov 2, 2024

Fix edge case for StubbedMock where it could return a blank suggestion for unhandled Expectation types.

Completes branch coverage for this file.


Before submitting the PR make sure the following are checked:

  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Updated documentation.
  • Added an entry to the CHANGELOG.md if the new code introduces user-observable changes.
  • The build (bundle exec rake) passes (be sure to run this locally, since it may produce updated documentation that you will need to commit).

If you have created a new cop:

  • Added the new cop to config/default.yml.
  • The cop is configured as Enabled: pending in config/default.yml.
  • The cop is configured as Enabled: true in .rubocop.yml.
  • The cop documents examples of good and bad code.
  • The tests assert both that bad code is reported and that good code is not reported.
  • Set VersionAdded: "<<next>>" in default/config.yml.

If you have modified an existing cop's configuration options:

  • Set VersionChanged: "<<next>>" in config/default.yml.

@corsonknowles corsonknowles requested a review from a team as a code owner November 2, 2024 21:52
@corsonknowles corsonknowles marked this pull request as draft November 2, 2024 21:58
@corsonknowles
Copy link
Contributor Author

Hmm, I think this spec passes both before and after the change, so there is some issue here:

  it 'flags `are_expected`' do
    expect_offense(<<~RUBY)
      are_expected.to receive(:bar).and_return(:baz)
      ^^^^^^^^^^^^ Prefer `` over `are_expected` when configuring a response.
    RUBY
  end

@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch from bdd66fa to e6bbc1d Compare November 2, 2024 23:58
@corsonknowles corsonknowles marked this pull request as ready for review November 2, 2024 23:59
@corsonknowles
Copy link
Contributor Author

Okay, I pushed up a real change -- now it only flags on the methods it can correct.

Thoughts?

@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch 2 times, most recently from 487bf67 to 86d1e71 Compare November 3, 2024 00:07
@bquorning bquorning requested a review from pirj November 3, 2024 20:19

it 'flags `should`', skip: 'Not implemented yet' do
expect_offense(<<~RUBY)
foo.should receive(:bar).and_return(:baz)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSpec 2 legacy, deprecated a decade ago and removed in next major RSpec. We don’t want to support this.

it 'flags `are_expected`',
skip: 'This passed before this commit. Handled like is_expected?' do
expect_offense(<<~RUBY)
are_expected.to receive(:bar).and_return(:baz)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this from rspec-its? It’s soft-maintained, and is unlikely can be named an integral part of RSpec. I’d rather documented how to add it to the co figuration if the cop was configurable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes: https://github.com/search?q=org%3Arspec%20are_expected&type=code

My understanding is that it is included in the Expectations.all that the current Cop is using.

end

def replacement(method_name)
case method_name
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer a case.
Why not?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SimpleCov pointed out that we don’t have any test coverage for when method_name didn’t match any of the options. And correctly so.

I also prefer the case statement, but perhaps we should add an else raise ArgumentError or KeyError or similar, and add test coverage (where relevant).

Copy link
Member

@pirj pirj Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha! We can actually configure expectations DSL, and add eg the mentioned are_expected, for which this cop won’t find a substitute.

But there is no substitute for eg are_expected. Can we skip correction in this case instead of throwing an argument error?

fetch would raise, and this is also an undesirable outcome, and a breaking change.

I was never a big fan of 100% coverage, but it really starts to manifest its benefits here!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correcting myself. Dsl conf link. are_expected, and should_* are included.

Quick suggestion: keep the case, but limit matching to just the three options we have substitutes for. Wdyt?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick suggestion: keep the case, but limit matching to just the three options we have substitutes for. Wdyt?

That is what we had before, no? Should we add an else case, and how should it respond?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously I think it was returning nil, and we auto-corrected to nonsense. Now, I think, it should just raise an offence and don’t autocorrect

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, I think, it should just raise an offence and don’t autocorrect

I'm not exactly sure how to accomplish this.

Would you like me to close this PR so you can take it a new direction?

Or I'm happy to continue helping out here if you are willing to coach me through it.

Copy link
Member

@pirj pirj Nov 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad - this cop does not autocorrect 🙈

Since there’s no valid suggestion for the message:

  1. add a new MSG_NO_REPLACEMENT with a different message
  2. use it for anything that doesn’t have a built-in counterpart

I insist on keeping the case statement, as ‘fetch’ may conceal execution paths from our coverage detection

@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch from 86d1e71 to cddc4db Compare November 6, 2024 01:01
@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch from cddc4db to 0fbc905 Compare November 16, 2024 08:50
@corsonknowles corsonknowles changed the title Use simple lookup table for replacements in StubbedMock Add an else condition to correct StubbedMock behavior Nov 16, 2024
@corsonknowles
Copy link
Contributor Author

Okay, how's this approach?

@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch from 0fbc905 to f6f03dc Compare November 16, 2024 08:56
@corsonknowles corsonknowles force-pushed the use_simple_lookup_table_for_replacements branch from f6f03dc to 2f4763e Compare November 16, 2024 08:59
@pirj
Copy link
Member

pirj commented Nov 17, 2024

Perfect, thank you, @corsonknowles !

@pirj pirj merged commit f58b9fe into rubocop:master Nov 17, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants