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

Update rubocop-rails 2.17.4 → 2.23.1 (minor) #339

Merged
merged 2 commits into from
Feb 6, 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
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Rails/ActionControllerTestCase:
Enabled: false

Metrics/BlockLength:
IgnoredMethods:
AllowedMethods:
- describe
- context
- background
Expand Down
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,11 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-rails (2.17.4)
rubocop-rails (2.23.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand Down
10 changes: 5 additions & 5 deletions lib/tasks/config.rake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace :config do
configuration[:searches] = {}.tap do |searches|
puts 'Preparing searches ...'

api.search.all.each do |search|
api.search.find_each do |search|
searches[search.name] = search.uuid
end
end
Expand Down Expand Up @@ -55,15 +55,15 @@ namespace :config do
configuration[:transfer_templates] = {}.tap do |transfer_templates|
# Plates
puts 'Preparing transfer templates ...'
api.transfer_template.all.each do |template|
api.transfer_template.find_each do |template|
next unless ['Whole plate to tube', 'Transfer columns 1-12', 'Flip Plate', 'Transfer between specific tubes'].include?(template.name)
transfer_templates[template.name] = template.uuid
end
end

configuration[:lot_types] = {}.tap do |lot_types|
puts 'Preparing lot types ...'
api.lot_type.all.each do |lot_type|
api.lot_type.find_each do |lot_type|
lot_types[lot_type.name] = { uuid: lot_type.uuid, template_class: lot_type.template_class, printer_type: lot_type.printer_type, qcable_name: lot_type.qcable_name }
end
end
Expand All @@ -72,7 +72,7 @@ namespace :config do
puts 'Preparing purposes ...'
puts '... plates'
raise 'No default purpose configuration specified.' if Gatekeeper::Application.config.default_purpose_handler.nil?
api.plate_purpose.all.each do |plate_purpose|
api.plate_purpose.find_each do |plate_purpose|
# Loads the default purpose info
if Gatekeeper::Application.config.default_purpose_handler[:child_name] == plate_purpose.name
configuration[:default_purpose] = Gatekeeper::Application.config.default_purpose_handler.merge(
Expand All @@ -88,7 +88,7 @@ namespace :config do
}.merge(Gatekeeper::Application.config.purpose_handlers[plate_purpose.name] || {})
end
puts '... tubes'
api.tube_purpose.all.each do |tube_purpose|
api.tube_purpose.find_each do |tube_purpose|
next unless Gatekeeper::Application.config.tracked_purposes.include?(tube_purpose.name)
purpose[tube_purpose.uuid] = {
name: tube_purpose.name,
Expand Down
Loading