Adyen: Replace empty state string with N/A

activemerchant · Jul 2, 2019 · 38327b3 · 38327b3
1 parent 4509244
commit 38327b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/active_merchant/billing/gateways/adyen.rb b/lib/active_merchant/billing/gateways/adyen.rb
@@ -232,11 +232,15 @@ def add_address(post, options)
           post[:billingAddress][:houseNumberOrName] = address[:address2] || 'N/A'
           post[:billingAddress][:postalCode] = address[:zip] if address[:zip]
           post[:billingAddress][:city] = address[:city] || 'N/A'
-          post[:billingAddress][:stateOrProvince] = address[:state] || 'N/A'
+          post[:billingAddress][:stateOrProvince] = get_state(address)
           post[:billingAddress][:country] = address[:country] if address[:country]
         end
       end
 
+      def get_state(address)
+        address[:state] && !address[:state].blank? ? address[:state] : 'N/A'
+      end
+
       def add_invoice(post, money, options)
         currency = options[:currency] || currency(money)
         amount = {

diff --git a/test/remote/gateways/remote_adyen_test.rb b/test/remote/gateways/remote_adyen_test.rb
@@ -605,11 +605,16 @@ def test_blank_country_for_purchase
     assert_match Gateway::STANDARD_ERROR_CODE[:incorrect_address], response.error_code
   end
 
+  def test_nil_state_for_purchase
+    @options[:billing_address][:state] = nil
+    response = @gateway.authorize(@amount, @credit_card, @options)
+    assert_success response
+  end
+
   def test_blank_state_for_purchase
     @options[:billing_address][:state] = ''
     response = @gateway.authorize(@amount, @credit_card, @options)
-    assert_failure response
-    assert_match Gateway::STANDARD_ERROR_CODE[:incorrect_address], response.error_code
+    assert_success response
   end
 
   def test_missing_phone_for_purchase