test/test_ext.rb in invoice_printer-0.0.1 vs test/test_ext.rb in invoice_printer-0.0.2

@@ -14,23 +14,23 @@
       strings << @document.provider_postcode
       strings << @document.provider_city
       strings << @document.provider_city_part
       strings << @document.provider_extra_address_line
 
-      strings << "#{@labels[:ic]}:    #{@document.provider_ic}" unless @document.provider_ic.nil?
-      strings << "#{@labels[:dic]}:    #{@document.provider_dic}" unless @document.provider_dic.nil?
+      strings << "#{@labels[:ic]}:    #{@document.provider_ic}" unless @document.provider_ic.empty?
+      strings << "#{@labels[:dic]}:    #{@document.provider_dic}" unless @document.provider_dic.empty?
 
       strings << @labels[:purchaser]
       strings << @document.purchaser_name
       strings << "#{@document.purchaser_street}    #{@document.purchaser_street_number}".strip
       strings << @document.purchaser_postcode
       strings << @document.purchaser_city
       strings << @document.purchaser_city_part
       strings << @document.purchaser_extra_address_line
 
-      strings << "#{@labels[:ic]}:    #{@document.purchaser_ic}" unless @document.purchaser_ic.nil?
-      strings << "#{@labels[:dic]}:    #{@document.purchaser_dic}" unless @document.purchaser_dic.nil?
+      strings << "#{@labels[:ic]}:    #{@document.purchaser_ic}" unless @document.purchaser_ic.empty?
+      strings << "#{@labels[:dic]}:    #{@document.purchaser_dic}" unless @document.purchaser_dic.empty?
 
       # Account
       if @document.bank_account_number.nil?
         strings << @labels[:payment_in_cash]
       else
@@ -66,9 +66,10 @@
       strings << @document.tax
       strings << "#{@labels[:tax2]}:"
       strings << @document.tax2
       strings << "#{@labels[:tax3]}:"
       strings << @document.tax3
+
       strings << "#{@labels[:total]}:   #{@document.total}"
 
       # TODO: dynamically test page numbers
       strings << '1 / 1'