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

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

Merged
merged 3 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
end
end
# wait for all the threads to finish
items.each { |_remote, opts| opts[:thread].join }
items.each_value { |opts| opts[:thread].join }

Check warning on line 320 in lib/puppetlabs_spec_helper/tasks/fixtures.rb

View check run for this annotation

Codecov / codecov/patch

lib/puppetlabs_spec_helper/tasks/fixtures.rb#L320

Added line #L320 was not covered by tests
end

# @param target [String] - the target directory
Expand Down Expand Up @@ -427,12 +427,12 @@

desc 'Clean up the fixtures directory'
task :spec_clean do
repositories.each do |_remote, opts|
repositories.each_value do |opts|

Check warning on line 430 in lib/puppetlabs_spec_helper/tasks/fixtures.rb

View check run for this annotation

Codecov / codecov/patch

lib/puppetlabs_spec_helper/tasks/fixtures.rb#L430

Added line #L430 was not covered by tests
target = opts['target']
FileUtils.rm_rf(target)
end

forge_modules.each do |_remote, opts|
forge_modules.each_value do |opts|

Check warning on line 435 in lib/puppetlabs_spec_helper/tasks/fixtures.rb

View check run for this annotation

Codecov / codecov/patch

lib/puppetlabs_spec_helper/tasks/fixtures.rb#L435

Added line #L435 was not covered by tests
target = opts['target']
FileUtils.rm_rf(target)
end
Expand All @@ -446,7 +446,7 @@

desc 'Clean up any fixture symlinks'
task :spec_clean_symlinks do
fixtures('symlinks').each do |_source, opts|
fixtures('symlinks').each_value do |opts|

Check warning on line 449 in lib/puppetlabs_spec_helper/tasks/fixtures.rb

View check run for this annotation

Codecov / codecov/patch

lib/puppetlabs_spec_helper/tasks/fixtures.rb#L449

Added line #L449 was not covered by tests
target = opts['target']
FileUtils.rm_f(target)
end
Expand Down