Merge pull request #151 from barberj/barberj/package-code-dimensions-bug

Include Dimensions regardless of package_code
friendlycart · Jan 19, 2023 · c71d408 · c71d408
2 parents 7d9b64e + c1866ca
commit c71d408
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/friendly_shipping/services/ship_engine/serialize_label_shipment.rb b/lib/friendly_shipping/services/ship_engine/serialize_label_shipment.rb
@@ -53,16 +53,13 @@ def serialize_packages(packages, options)
                 ["reference#{index + 1}".to_sym, message]
               end.to_h
 
-              if package_options.package_code
-                package_hash[:package_code] = package_options.package_code
-              else
-                package_hash[:dimensions] = {
-                  unit: 'inch',
-                  width: package.container.width.convert_to(:inches).value.to_f.round(2),
-                  length: package.container.length.convert_to(:inches).value.to_f.round(2),
-                  height: package.container.height.convert_to(:inches).value.to_f.round(2)
-                }
-              end
+              package_hash[:package_code] = package_options.package_code
+              package_hash[:dimensions] = {
+                unit: 'inch',
+                width: package.container.width.convert_to(:inches).value.to_f.round(2),
+                length: package.container.length.convert_to(:inches).value.to_f.round(2),
+                height: package.container.height.convert_to(:inches).value.to_f.round(2)
+              }
               package_hash
             end
           end

diff --git a/spec/friendly_shipping/services/ship_engine/serialize_label_shipment_spec.rb b/spec/friendly_shipping/services/ship_engine/serialize_label_shipment_spec.rb
@@ -80,12 +80,12 @@
       ]
     end
 
-    it 'does not include the dimensions array' do
+    it 'still includes the dimensions array' do
       is_expected.to match(
         hash_including(
           shipment: hash_including(
             packages: array_including(
-              hash_not_including(:dimensions)
+              hash_including(:dimensions)
             )
           )
         )