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 mixins folder #1056

Merged
merged 1 commit into from Oct 23, 2020
Merged

Add mixins folder #1056

merged 1 commit into from Oct 23, 2020

Conversation

bquorning
Copy link
Collaborator

@bquorning bquorning commented Oct 22, 2020

Closes #942

I rebased @mockdeep’s pull request #942 but found that I cannot push to that branch. So, I opened this new pull request.

Original description:

This moves several files to a new mixins/ folder. I was going to add
some new macros, per this comment, but thought it might clutter
things up a bit to put them in the root folder. I thought of adding a
macros/ folder, but decided to emulate the rubocop source
instead.


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

@bquorning bquorning added this to the 2.0 milestone Oct 22, 2020
@bquorning bquorning mentioned this pull request Oct 22, 2020
@pirj pirj mentioned this pull request Oct 22, 2020
6 tasks
Copy link
Member

@pirj pirj left a comment

Choose a reason for hiding this comment

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

All looks good, except for the retired top_level_describe.

This moves several files to a new `mixins/` folder. I was going to add
some new macros, per [this comment][1], but thought it might clutter
things up a bit to put them in the root folder. I thought of adding a
`macros/` folder, but decided to emulate the [rubocop source][2]
instead.

[1]: #934 (comment)
[2]: https://github.com/rubocop-hq/rubocop/tree/master/lib/rubocop/cop/mixin
@bquorning
Copy link
Collaborator Author

@pirj Please merge at will. #956 will need to be rebased afterwards.

@pirj pirj merged commit 912ae66 into release-2.0 Oct 23, 2020
@pirj pirj deleted the rf-mixins branch October 23, 2020 19:50
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.

None yet

3 participants