Skip to content

Revert "(maint) Exclude breaking rubocop versions" #467

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Revert "(maint) Exclude breaking rubocop versions" #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
962013f
Revert "(maint) Exclude breaking rubocop versions"
gavindidrichsen Jun 13, 2024
173ba17
Update rubocop dependencies
gavindidrichsen Jun 13, 2024
02f4c47
Fix ruby cop warning
gavindidrichsen Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ group :development do
gem 'rake'
gem 'rspec', '~> 3.1'
gem 'rspec-its', '~> 1.0'
gem 'rubocop', '~> 1.50.0', require: false
gem 'rubocop-rspec', '~> 2.19', require: false
gem 'rubocop', '~> 1.64.0', require: false
gem 'rubocop-rspec', '~> 3.0', require: false
gem 'rubocop-performance', '~> 1.16', require: false
gem 'rubocop-factory_bot', '!= 2.26.0', require: false
gem 'rubocop-rspec_rails', '!= 2.29.0', require: false

gem 'fakefs'
gem 'yard'
Expand Down
2 changes: 1 addition & 1 deletion lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def function_method(name, parts = {})
# exposed hack.
return nil unless Puppet::Parser::Functions.function(name)

scope.method("function_#{name}".to_sym)
scope.method(:"function_#{name}")
end
module_function :function_method
end
Expand Down
8 changes: 4 additions & 4 deletions lib/puppetlabs_spec_helper/tasks/fixtures.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def download_items(items)
end
end
# wait for all the threads to finish
items.each { |_remote, opts| opts[:thread].join }
items.each_value { |opts| opts[:thread].join }
end

# @param target [String] - the target directory
Expand Down Expand Up @@ -427,12 +427,12 @@ def download_module(remote, opts)

desc 'Clean up the fixtures directory'
task :spec_clean do
repositories.each do |_remote, opts|
repositories.each_value do |opts|
target = opts['target']
FileUtils.rm_rf(target)
end

forge_modules.each do |_remote, opts|
forge_modules.each_value do |opts|
target = opts['target']
FileUtils.rm_rf(target)
end
Expand All @@ -446,7 +446,7 @@ def download_module(remote, opts)

desc 'Clean up any fixture symlinks'
task :spec_clean_symlinks do
fixtures('symlinks').each do |_source, opts|
fixtures('symlinks').each_value do |opts|
target = opts['target']
FileUtils.rm_f(target)
end
Expand Down