fix: article convert_unit will fail when unit contains a comma character

foodcoops · Jan 26, 2024 · fa9083d · fa9083d
1 parent ebbac04
commit fa9083d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/article.rb b/app/models/article.rb
@@ -189,6 +189,7 @@ def shared_article(supplier = self.supplier)
   # returns nil if units are eqal
   def convert_units(new_article = shared_article)
     return unless unit != new_article.unit
+    return false if new_article.unit.include?(',')
 
     # legacy, used by foodcoops in Germany
     if new_article.unit == 'KI' && unit == 'ST' # 'KI' means a box, with a different amount of items in it

diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
@@ -31,8 +31,7 @@
       expect(article1.convert_units(article2)).to be false
     end
 
-    xit 'returns false if unit becomes zero because of , symbol in unit format' do
-      # @todo broken after latest update as conversion logic changes?!
+    it 'returns false if unit becomes zero because of , symbol in unit format' do
       article1 = build(:article, supplier: supplier, unit: '0,8kg', price: 2, unit_quantity: 1)
       article2 = build(:article, supplier: supplier, unit: '0,9kg', price: 2, unit_quantity: 1)
       expect(article1.convert_units(article2)).to be false