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

Fix rubocop after disabling BooleanSymbol cop #271

Merged
merged 2 commits into from
Dec 1, 2021
Merged

Conversation

root-expert
Copy link
Member

Pull Request (PR) description

This Pull Request (PR) fixes the following issues

Copy link
Member

@alexjfisher alexjfisher left a comment

Choose a reason for hiding this comment

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

This doesn't revert the changes that were made to the types/providers.

Suggest doing a revert of 70c2adc and then rerunning the original autocorrect rake task.

@root-expert
Copy link
Member Author

Makes sense, Thanks!

@alexjfisher
Copy link
Member

Makes sense, Thanks!

Sorry, just realised you might not have had the full context, and only come across the issue because of the now failing build.
What we really need to fix is #270 (comment)

This reverts commit 70c2adc.
@@ -147,7 +147,7 @@ def password=(value)
save_datasource
end

# rubocop:disable Naming/PredicateName
# rubocop:disable Style/PredicateName
Copy link
Member Author

Choose a reason for hiding this comment

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

For these rubocop complains although autofix changed them?

Copy link
Member

Choose a reason for hiding this comment

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

what did it complain about? In an older rubocop version it was in the Naming namespace and the cop got moved to Style (or the other way around).

Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -218,7 +218,7 @@ def existing_permissions
end
end

def permission_data(destroy = false) # rubocop:disable Style/OptionalBooleanParameter
def permission_data(destroy = false)
Copy link
Member Author

Choose a reason for hiding this comment

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

Thoughts for this one?
I added # rubocop:disable Style/OptionalBooleanParameter

@@ -182,7 +182,7 @@ def permission=(value)
def new_permission
key = resource[:user] ? :userId : :teamId
subject_id = resource[:user] ? user[:id] : team[:id]
permission = case resource[:permission] # rubocop:disable Style/HashLikeCase
permission = case resource[:permission]
Copy link
Member Author

Choose a reason for hiding this comment

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

And this one

@@ -183,7 +183,7 @@
describe 'create data_dir' do
it { is_expected.to contain_file('/var/lib/grafana').with_ensure('directory') }
end
when 'FreBSD'
when 'FreeBSD'
Copy link
Member

Choose a reason for hiding this comment

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

ah lol

Copy link
Member Author

Choose a reason for hiding this comment

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

😄

@alexjfisher alexjfisher merged commit 2b8d4b8 into master Dec 1, 2021
@alexjfisher alexjfisher deleted the fix-rubocop branch December 1, 2021 12:18
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