Merge pull request #886 from trade-tariff/hott-2270-bug-fix

HOTT-2270: Fixed missing percent symbol in verbose duty

app/formatters/duty_expression_formatter.rb

@@ -63,7 +63,7 @@ def format(opts = {})
         output << if monetary_unit.present? && !verbose
                     monetary_unit
                   else
-                    '%' unless verbose
+                    '%' unless monetary_unit
                   end
         if measurement_unit_abbreviation.present?
           output << if formatted

app/models/measure.rb

@@ -403,10 +403,7 @@ def verbose_duty_expression
   end
 
   def prettify_generated_duty_expression!(duty_expression)
-    duty_expression.sub!(/\s\s/, ' ')
-    duty_expression.sub!(/\s%/, '%') if duty_expression.scan(/\d\s%/).present?
-    duty_expression.sub!(/\/\s[a-zA-Z]/, &:downcase)
-    duty_expression
+    duty_expression.gsub(/\s\s/, ' ').gsub(/(\d)\s+%/, '\1%').sub(/\/\s[a-zA-Z]/, &:downcase)
   end
 
   def national_measurement_units_for(declarable)

spec/models/measure_spec.rb

@@ -1428,6 +1428,10 @@
       expect(measure.prettify_generated_duty_expression!(generated_string)).to eq '100% / percentage ABV (% vol) per 100 litre (hl)'
     end
 
+    it 'removes spaces if there are multiple % symbols' do
+      expect(measure.prettify_generated_duty_expression!('2.70 % + EAR MAX 6.20 % +ADSZR 11 %')).to eq '2.70% + EAR MAX 6.20% +ADSZR 11%'
+    end
+
     it 'does not remove space if unit is not present' do
       expect(measure.prettify_generated_duty_expression!(generated_string_without_percent_amount)).to eq generated_string_without_percent_amount
     end