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

Correct some offenses for RuboCop v1.56.0 #1692

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Correct some offenses for RuboCop v1.56.0 #1692

merged 1 commit into from
Aug 9, 2023

Conversation

ydah
Copy link
Member

@ydah ydah commented Aug 9, 2023

#1690 needs this PR's changes.

❯ bundle exec rubocop -A
Inspecting 280 files
.....................................................................................................................................C..................................................................................................................................................

Offenses:

lib/rubocop/cop/rspec/void_expect.rb:53:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
          return true if parent.begin_type?
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/rubocop/cop/rspec/void_expect.rb:54:11: C: [Corrected] Style/RedundantReturn: Redundant return detected.
          return true if parent.block_type? && parent.body == expect
          ^^^^^^

280 files inspected, 2 offenses detected, 2 offenses corrected

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).

```
❯ bundle exec rubocop -A
Inspecting 280 files
.....................................................................................................................................C..................................................................................................................................................

Offenses:

lib/rubocop/cop/rspec/void_expect.rb:53:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
          return true if parent.begin_type?
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/rubocop/cop/rspec/void_expect.rb:54:11: C: [Corrected] Style/RedundantReturn: Redundant return detected.
          return true if parent.block_type? && parent.body == expect
          ^^^^^^

280 files inspected, 2 offenses detected, 2 offenses corrected
```
@ydah ydah merged commit 03df044 into master Aug 9, 2023
22 checks passed
@ydah ydah deleted the correct_offense branch August 9, 2023 12:24
@ydah ydah mentioned this pull request Aug 9, 2023
5 tasks
@@ -51,7 +51,8 @@ def void?(expect)
parent = expect.parent
return true unless parent
return true if parent.begin_type?
return true if parent.block_type? && parent.body == expect

true if parent.block_type? && parent.body == expect
Copy link
Collaborator

@bquorning bquorning Aug 9, 2023

Choose a reason for hiding this comment

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

This could be simplified to

parent.block_type? && parent.body == expect

(removing true if)

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe, would it be good to have a cop to offense this?

Copy link
Member Author

Choose a reason for hiding this comment

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

ydah added a commit that referenced this pull request Oct 3, 2023
Follow up: #1692 (comment)

```
❯ bundle exec rubocop -A
Inspecting 291 files
...........................................................................................................................................C.......................................................................................................................................................

Offenses:

lib/rubocop/cop/rspec/void_expect.rb:55:11: C: [Corrected] Workit/RedundantBooleanConditional: This conditional expression can just be replaced by parent.block_type? && parent.body == expect.
          true if parent.block_type? && parent.body == expect
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

291 files inspected, 1 offense detected, 1 offense corrected
```
@ydah ydah mentioned this pull request Oct 3, 2023
3 tasks
ydah added a commit that referenced this pull request Oct 4, 2023
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.

2 participants