activemerchant 1.4.1 → 1.4.2

data/lib/active_merchant/lib/requires_parameters.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
           raise ArgumentError.new("Missing required parameter: #{param.first}") unless hash.has_key?(param.first) 
 
           valid_options = param[1..-1]
-          raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:connector => 'or')}") unless valid_options.include?(hash[param.first])
+          raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:words_connector => 'or')}") unless valid_options.include?(hash[param.first])
         else
           raise ArgumentError.new("Missing required parameter: #{param}") unless hash.has_key?(param) 
         end

data/test/fixtures.yml

@@ -172,11 +172,27 @@ psl_visa_address:
   address2: 
   address3: 
   city: 
-  zip: 
+  zip:
+    
+psl_visa_debit:
+  first_name:
+  last_name:
+  number:
+  month:
+  year:
+  verification_value:
+
+psl_visa_debit_address:
+  address1:
+  address2:
+  address3:
+  city:
+  state:
+  zip:
 
 quickpay:
-  login: X
-  password: Y
+  login: 89898989
+  password: "n5KrR5e2538awi9hUk6728LHTQ6E4uG1z4IFSb2pPN9j76DqJ2vA4698X315M1cd"
     
 realex:
   login: X 

data/test/remote/gateways/remote_braintree_test.rb

@@ -5,7 +5,8 @@ class RemoteBraintreeTest < Test::Unit::TestCase
     @gateway = BraintreeGateway.new(fixtures(:braintree))
 
     @amount = rand(10000) + 1001
-    @credit_card = credit_card('4111111111111111', :type => 'visa')
+    @credit_card = credit_card('4111111111111111')
+    @check = check()
     @declined_amount = rand(99)
     @options = {  :order_id => generate_unique_id,
                   :billing_address => address
@@ -33,7 +34,7 @@ class RemoteBraintreeTest < Test::Unit::TestCase
               :account_holder_type => 'personal',
               :account_type => 'checking'
             )
-    assert response = @gateway.purchase(@amount, check, @options)
+    assert response = @gateway.purchase(@amount, @check, @options)
     assert_equal 'This transaction has been approved', response.message
     assert_success response
   end
@@ -48,7 +49,7 @@ class RemoteBraintreeTest < Test::Unit::TestCase
 
   def test_successful_add_to_vault_with_store_method
     assert response = @gateway.store(@credit_card)
-    assert_equal 'This transaction has been approved', response.message
+    assert_equal 'Customer Added', response.message
     assert_success response
     assert_not_nil response.params["customer_vault_id"]
   end
@@ -76,11 +77,17 @@ class RemoteBraintreeTest < Test::Unit::TestCase
   def test_add_to_vault_with_custom_vault_id_with_store_method
     @options[:billing_id] = rand(100000)+10001
     assert response = @gateway.store(@credit_card, @options.dup)
-    assert_equal 'This transaction has been approved', response.message
+    assert_equal 'Customer Added', response.message
     assert_success response
     assert_equal @options[:billing_id], response.params["customer_vault_id"].to_i
   end
   
+  def test_add_to_vault_with_store_and_check
+    assert response = @gateway.store(@check, @options)
+    assert_equal 'Customer Added', response.message
+    assert_success response
+  end
+  
   def test_update_vault
     test_add_to_vault_with_custom_vault_id
     @credit_card = credit_card('4111111111111111', :month => 10)

data/test/remote/gateways/remote_card_stream_test.rb

@@ -7,38 +7,38 @@ class RemoteCardStreamTest < Test::Unit::TestCase
     @gateway = CardStreamGateway.new(fixtures(:card_stream))
     
     @amex = credit_card('374245455400001',
-              :month => 12,
-              :year => 2009,
-              :verification_value => 4887,
+              :month => '12',
+              :year => '2009',
+              :verification_value => '4887',
               :type => :american_express
             )
 
-    @uk_maestro = credit_card('6759016800000120097',
-                    :month => 6,
-                    :year => 2009,
-                    :issue_number => 1,
-                    :verification_value => 701,
+    @uk_maestro = credit_card('675940410531100173',
+                    :month => '12',
+                    :year => '2008',
+                    :issue_number => '0',
+                    :verification_value => '134',
                     :type => :switch
                   )
     
-    @solo = credit_card('6334960300099354',
-              :month => 6,
-              :year => 2008,
-              :issue_number => 1,
-              :verification_value => 227,
+    @solo = credit_card('676740340572345678',
+              :month => '12',
+              :year => '2008',
+              :issue_number => '1',
+              :verification_value => '773',
               :type => :solo
             )
 
     @mastercard = credit_card('5301250070000191',
-                    :month => 12,
-                    :year => 2009,
-                    :verification_value => 419,
+                    :month => '12',
+                    :year => '2009',
+                    :verification_value => '419',
                     :type => :master
                   )
 
     @declined_card = credit_card('4000300011112220',
-                      :month => 9,
-                      :year => 2009
+                      :month => '9',
+                      :year => '2009'
                     )
 
     @mastercard_options = { 
@@ -135,13 +135,13 @@ class RemoteCardStreamTest < Test::Unit::TestCase
       :password => ''
     )
     assert response = gateway.purchase(100, @mastercard, @mastercard_options)
-    assert_equal 'Merchant ID or Password Error', response.message
+    assert_equal 'MERCHANT ID MISSING', response.message
     assert_failure response
   end
   
   def test_unsupported_merchant_currency
     assert response = @gateway.purchase(100, @mastercard, @mastercard_options.update(:currency => 'USD'))
-    assert_equal "ERROR 5456:CURRENCY NOT SUPPORTED FOR THIS MERCHANT ACCOUNT", response.message
+    assert_equal "ERROR 1052", response.message
     assert_failure response
     assert response.test?
   end

data/test/remote/gateways/remote_psl_card_test.rb

@@ -16,6 +16,9 @@ class RemotePslCardTest < Test::Unit::TestCase
     @visa = CreditCard.new(fixtures(:psl_visa))
     @visa_address = fixtures(:psl_visa_address)
     
+    @visa_debit = CreditCard.new(fixtures(:psl_visa_debit))
+    @visa_address = fixtures(:psl_visa_debit_address)
+    
     # The test results are determined by the amount of the transaction
     @accept_amount = 1000
     @referred_amount = 6000
@@ -31,6 +34,22 @@ class RemotePslCardTest < Test::Unit::TestCase
     assert response.test?
   end
   
+  def test_successful_visa_debit_purchase
+    response = @gateway.purchase(@accept_amount, @visa_debit,
+      :billing_address => @visa_debit_address
+    )
+    assert_success response
+  end
+  
+  # Fix regression discovered in production
+  def test_visa_debit_purchase_should_not_send_debit_info_if_present
+    @visa_debit.start_month = "07"
+    response = @gateway.purchase(@accept_amount, @visa_debit,
+      :billing_address => @visa_debit_address
+    )
+    assert_success response
+  end
+  
   def test_successful_visa_purchase_specifying_currency
     response = @gateway.purchase(@accept_amount, @visa,
       :billing_address => @visa_address,
@@ -73,8 +92,8 @@ class RemotePslCardTest < Test::Unit::TestCase
   end
   
   def test_successful_authorization
-    response = @gateway.authorize(@accept_amount, @uk_maestro, 
-      :billing_address => @uk_maestro_address
+    response = @gateway.authorize(@accept_amount, @visa, 
+      :billing_address => @visa_address
     )
     assert_success response
     assert response.test?
@@ -92,8 +111,8 @@ class RemotePslCardTest < Test::Unit::TestCase
   end
   
   def test_successful_authorization_and_capture
-    authorization = @gateway.authorize(@accept_amount, @uk_maestro,
-      :billing_address => @uk_maestro_address
+    authorization = @gateway.authorize(@accept_amount, @visa,
+      :billing_address => @visa_address
     )
     assert_success authorization
     assert authorization.test?

data/test/remote/gateways/remote_quickpay_test.rb

@@ -6,7 +6,7 @@ class RemoteQuickpayTest < Test::Unit::TestCase
 
     @amount = 100
     @options = { 
-      :order_id => generate_unique_id, 
+      :order_id => generate_unique_id[0...10], 
       :billing_address => address
     }
     
@@ -65,7 +65,7 @@ class RemoteQuickpayTest < Test::Unit::TestCase
   end
   
   def test_successful_diners_club_authorization
-    assert response = @gateway.authorize(@amount, @diners_club, @options)
+    assert response = @gateway.authorize(@amount, @diners_club, @options)    
     assert_success response
     assert !response.authorization.blank?
     assert_equal 'Diners', response.params['cardtype']
@@ -75,7 +75,7 @@ class RemoteQuickpayTest < Test::Unit::TestCase
     assert response = @gateway.authorize(@amount, @diners_club_dk, @options)
     assert_success response
     assert !response.authorization.blank?
-    assert_equal 'Diners', response.params['cardtype']
+    assert_equal 'Diners-DK', response.params['cardtype']
   end
   
   def test_successful_maestro_authorization
@@ -89,7 +89,7 @@ class RemoteQuickpayTest < Test::Unit::TestCase
     assert response = @gateway.authorize(@amount, @maestro_dk, @options)
     assert_success response
     assert !response.authorization.blank?
-    assert_equal 'Maestro', response.params['cardtype']
+    assert_equal 'Maestro-DK', response.params['cardtype']
   end
   
   def test_successful_mastercard_dk_authorization
@@ -122,9 +122,10 @@ class RemoteQuickpayTest < Test::Unit::TestCase
   
   def test_unsuccessful_purchase_with_missing_cvv2
     assert response = @gateway.purchase(@amount, @visa_no_cvv2, @options)
-    assert_equal 'Missing/error in card verification data', response.message
-    assert_failure response
-    assert response.authorization.blank?
+    # Quickpay has made the cvd field optional in order to support forbrugsforeningen cards which don't have them
+    assert_equal 'OK', response.message
+    assert_success response
+    assert !response.authorization.blank?
   end
 
   def test_successful_authorize_and_capture
@@ -140,7 +141,7 @@ class RemoteQuickpayTest < Test::Unit::TestCase
   def test_failed_capture
     assert response = @gateway.capture(@amount, '')
     assert_failure response
-    assert_equal 'Missing/error in transaction number', response.message
+    assert_equal 'Missing field: transaction', response.message
   end
   
   def test_successful_purchase_and_void
@@ -170,13 +171,20 @@ class RemoteQuickpayTest < Test::Unit::TestCase
     assert_success credit
   end
 
+  def test_successful_store_and_reference_purchase
+    assert store = @gateway.store(@visa, @options.merge(:description => "New subscription"))
+    assert_success store
+    assert purchase = @gateway.purchase(@amount, store.authorization, @options.merge(:order_id => generate_unique_id[0...10]))
+    assert_success purchase
+  end
+
   def test_invalid_login
     gateway = QuickpayGateway.new(
         :login => '',
         :password => ''
     )
     assert response = gateway.purchase(@amount, @visa, @options)
-    assert_equal 'Missing/error in merchant', response.message
+    assert_equal 'Invalid merchant id', response.message
     assert_failure response
   end
 end

data/test/remote/gateways/remote_wirecard_test.rb

@@ -56,14 +56,15 @@ class RemoteWirecardTest < Test::Unit::TestCase
 
   def test_wrong_creditcard_purchase
     assert response = @gateway.purchase(@amount, @declined_card, @options)
+    assert response.test?
     assert_failure response
-    assert response.message[ /Credit card number not allowed in demo mode/ ]
+    assert response.message[ /Credit card number not allowed in demo mode/ ], "Got wrong response message"
   end
   
   def test_unauthorized_capture
     assert response = @gateway.capture(@amount, "1234567890123456789012")
     assert_failure response
-    assert response.message == "Could not find referenced transaction for GuWID 1234567890123456789012."
+    assert_equal "Could not find referenced transaction for GuWID 1234567890123456789012.", response.message
   end
 
   def test_invalid_login

data/test/test_helper.rb

@@ -112,8 +112,9 @@ end
 module Test
   module Unit
     class TestCase
-      LOCAL_CREDENTIALS = ENV['HOME'] + '/.active_merchant/fixtures.yml' unless defined?(LOCAL_CREDENTIALS)
-      DEFAULT_CREDENTIALS = File.dirname(__FILE__) + '/fixtures.yml' unless defined?(DEFAULT_CREDENTIALS)
+      HOME_DIR = RUBY_PLATFORM =~ /mswin32/ ? ENV['HOMEPATH'] : ENV['HOME'] unless defined?(HOME_DIR)
+      LOCAL_CREDENTIALS = File.join(HOME_DIR.to_s, '.active_merchant/fixtures.yml') unless defined?(LOCAL_CREDENTIALS)
+      DEFAULT_CREDENTIALS = File.join(File.dirname(__FILE__), 'fixtures.yml') unless defined?(DEFAULT_CREDENTIALS)
       
       include ActiveMerchant::Billing
       include ActiveMerchant::Assertions

data/test/unit/credit_card_test.rb

@@ -152,6 +152,13 @@ class CreditCardTest < Test::Unit::TestCase
     assert_valid @visa
   end
 
+
+  def test_should_be_valid_with_start_month_and_year_as_string
+    @solo.start_month = '2'
+    @solo.start_year = '2007'
+    assert_valid @solo
+  end
+
   def test_should_identify_wrong_cardtype
     c = credit_card(:type => 'master')
     assert_not_valid c

data/test/unit/gateways/authorize_net_cim_test.rb

@@ -44,11 +44,8 @@ class AuthorizeNetCimTest < Test::Unit::TestCase
   end
   
   def test_expdate_formatting
-    assert_equal '2009-09', @gateway.send(:expdate, @credit_card)
-
-    assert_equal '2013-11', @gateway.send(:expdate, credit_card('4111111111111111',
-                                          :month => 11,
-                                          :year => 2013))
+    assert_equal '2009-09', @gateway.send(:expdate, credit_card('4111111111111111', :month => "9", :year => "2009"))
+    assert_equal '2013-11', @gateway.send(:expdate, credit_card('4111111111111111', :month => "11", :year => "2013"))
   end
   
   def test_should_create_customer_profile_request

data/test/unit/gateways/authorize_net_test.rb

@@ -73,6 +73,20 @@ class AuthorizeNetTest < Test::Unit::TestCase
     assert_equal 'My Purchase is great', result[:description]
   end
   
+  def test_add_duplicate_window_without_duplicate_window
+    result = {}
+    ActiveMerchant::Billing::AuthorizeNetGateway.duplicate_window = nil
+    @gateway.send(:add_duplicate_window, result)
+    assert_nil result[:duplicate_window]
+  end
+  
+  def test_add_duplicate_window_with_duplicate_window
+    result = {}
+    ActiveMerchant::Billing::AuthorizeNetGateway.duplicate_window = 0
+    @gateway.send(:add_duplicate_window, result)
+    assert_equal 0, result[:duplicate_window]
+  end
+  
   def test_purchase_is_valid_csv
    params = { :amount => '1.01' }
    
@@ -193,15 +207,11 @@ class AuthorizeNetTest < Test::Unit::TestCase
   end
 
   def test_expdate_formatting
-    assert_equal '2009-09', @gateway.send(:arb_expdate, @credit_card)
-
-    assert_equal '2013-11', @gateway.send(:arb_expdate, credit_card('4111111111111111',
-                                          :month => 11,
-                                          :year => 2013))
+    assert_equal '2009-09', @gateway.send(:arb_expdate, credit_card('4111111111111111', :month => "9", :year => "2009"))
+    assert_equal '2013-11', @gateway.send(:arb_expdate, credit_card('4111111111111111', :month => "11", :year => "2013"))
   end
 
   private
-
   def post_data_fixture
     'x_encap_char=%24&x_card_num=4242424242424242&x_exp_date=0806&x_card_code=123&x_type=AUTH_ONLY&x_first_name=Longbob&x_version=3.1&x_login=X&x_last_name=Longsen&x_tran_key=Y&x_relay_response=FALSE&x_delim_data=TRUE&x_delim_char=%2C&x_amount=1.01'
   end

data/test/unit/gateways/bogus_test.rb

@@ -23,6 +23,10 @@ class BogusTest < Test::Unit::TestCase
   def test_credit
     @gateway.credit(1000, @response.params["transid"])
   end
+
+  def test_void
+    @gateway.void(@response.params["transid"])
+  end
   
   def  test_store
     @gateway.store(@creditcard)

data/test/unit/gateways/moneris_test.rb

@@ -87,7 +87,7 @@ class MonerisTest < Test::Unit::TestCase
   end
   
   def test_supported_card_types
-    assert_equal [:visa, :master], MonerisGateway.supported_cardtypes
+    assert_equal [:visa, :master, :american_express], MonerisGateway.supported_cardtypes
   end
 
   def test_should_raise_error_if_transaction_param_empty_on_credit_request

data/test/unit/gateways/payflow_test.rb

@@ -91,6 +91,12 @@ class PayflowTest < Test::Unit::TestCase
     assert_equal 'PayPal', gateway.options[:partner]
   end
   
+  def test_partner_class_accessor_used_when_passed_in_partner_is_blank
+    assert_equal 'PayPal', PayflowGateway.partner
+    gateway = PayflowGateway.new(:login => 'test', :password => 'test', :partner => '')
+    assert_equal 'PayPal', gateway.options[:partner]
+  end
+  
   def test_passed_in_partner_overrides_class_accessor
     assert_equal 'PayPal', PayflowGateway.partner
     gateway = PayflowGateway.new(:login => 'test', :password => 'test', :partner => 'PayPalUk')
@@ -98,14 +104,12 @@ class PayflowTest < Test::Unit::TestCase
   end
   
   def test_express_instance
-    PayflowGateway.certification_id = '123456'
     gateway = PayflowGateway.new(
       :login => 'test',
       :password => 'password'
     )
     express = gateway.express
     assert_instance_of PayflowExpressGateway, express
-    assert_equal '123456', express.options[:certification_id]
     assert_equal 'PayPal', express.options[:partner]
     assert_equal 'test', express.options[:login]
     assert_equal 'password', express.options[:password]