Skip to content
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
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Lint/AmbiguousBlockAssociation:
Naming/MemoizedInstanceVariableName:
Enabled: false


# There is a lot of existing inconsistent code making it not worth enforcing this cop
Naming/PredicateMethod:
Enabled: false
Expand All @@ -62,6 +61,10 @@ Style/CaseEquality:
Exclude:
- 'config/initializers/02_proc.rb'

Style/OneClassPerFile:
Exclude:
- 'spec/**/*'

# Causes a lot of Rubocop errors
RSpecRails/InferredSpecType:
Enabled: false
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ GEM
racc (~> 1.4)
ostruct (0.6.3)
parallel (1.27.0)
parser (3.3.10.1)
parser (3.3.11.1)
ast (~> 2.4.1)
racc
pp (0.6.3)
Expand Down Expand Up @@ -338,7 +338,7 @@ GEM
rspec-mocks (>= 3.13.0, < 5.0.0)
rspec-support (>= 3.13.0, < 5.0.0)
rspec-support (3.13.7)
rubocop (1.84.1)
rubocop (1.86.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand All @@ -349,7 +349,7 @@ GEM
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.0)
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-capybara (2.22.1)
Expand Down
2 changes: 1 addition & 1 deletion app/forms/move_location_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def child_locations=(child_location_barcodes)
.uniq
.collect(&:strip)
.collect do |barcode|
Location.find_by(barcode: barcode) || barcode
Location.find_by(barcode: barcode) || barcode
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/tasks/lighthouse_data_fix.rake
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace :lighthouse_boxes do
puts "Labwares to remove: #{dodgy_labware_barcodes}"
puts "Number labwares to remove: #{dodgy_labware_barcodes.count}"

barcode_to_destination_location_id = dodgy_labware.each_with_object({}) do |lw, object|
object[lw.barcode] = lw.location_id
barcode_to_destination_location_id = dodgy_labware.to_h do |lw|
[lw.barcode, lw.location_id]
end
puts "Box barcode to desired location: #{barcode_to_destination_location_id}"

Expand Down
Loading