Merge pull request #2873 from sanger/GPL-605-Unable-to-print-barcode-…

…from-multiplexed-library-manifests Modified ean13_barcode to human_barcode for label printer base_tube.
sanger · Aug 12, 2020 · 8d3fca6 · 8d3fca6
2 parents 0682736 + 5557cb1
commit 8d3fca6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/lib/label_printer/label_printer/label/base_tube.rb b/lib/label_printer/label_printer/label/base_tube.rb
@@ -32,7 +32,7 @@ def round_label_bottom_line(tube)
       end
 
       def barcode(tube)
-        tube.ean13_barcode
+        tube.machine_barcode
       end
 
       def tubes

diff --git a/spec/lib/label_printer/asset_labels_spec.rb b/spec/lib/label_printer/asset_labels_spec.rb
@@ -73,7 +73,7 @@
           bottom_line: date,
           round_label_top_line: asset.prefix,
           round_label_bottom_line: asset.barcode_number,
-          barcode: asset.machine_barcode.to_s } }
+          barcode: asset.machine_barcode } }
       end
     end
 

diff --git a/test/lib/label_printer/batch_multiplex_test.rb b/test/lib/label_printer/batch_multiplex_test.rb
@@ -28,7 +28,7 @@ def setup
                bottom_line: (Date.today.strftime('%e-%^b-%Y')).to_s,
                round_label_top_line: prefix,
                round_label_bottom_line: barcode1,
-               barcode: tube1.ean13_barcode }
+               barcode: tube1.machine_barcode }
   end
 
   test 'should return correct tubes' do

diff --git a/test/lib/label_printer/plate_to_tube_test.rb b/test/lib/label_printer/plate_to_tube_test.rb
@@ -22,7 +22,7 @@ def setup
                bottom_line: (Date.today.strftime('%e-%^b-%Y')).to_s,
                round_label_top_line: prefix,
                round_label_bottom_line: barcode1,
-               barcode: tube1.ean13_barcode }
+               barcode: tube1.machine_barcode }
   end
 
   test 'should have tubes' do

diff --git a/test/lib/label_printer/sample_manifest_multiplex_test.rb b/test/lib/label_printer/sample_manifest_multiplex_test.rb
@@ -26,7 +26,7 @@ def setup
                bottom_line: (Date.today.strftime('%e-%^b-%Y')).to_s,
                round_label_top_line: prefix,
                round_label_bottom_line: barcode1,
-               barcode: tube1.ean13_barcode }
+               barcode: tube1.machine_barcode }
   end
 
   test 'should return correct tubes' do

diff --git a/test/lib/label_printer/sample_manifest_tube_test.rb b/test/lib/label_printer/sample_manifest_tube_test.rb
@@ -26,7 +26,7 @@ def setup
                bottom_line: (Date.today.strftime('%e-%^b-%Y')).to_s,
                round_label_top_line: prefix,
                round_label_bottom_line: barcode1,
-               barcode: tube1.ean13_barcode }
+               barcode: tube1.machine_barcode }
   end
 
   test 'should return the right list of tubes' do