activemerchant 1.2.1 → 1.3.0

data/test/{remote_tests → remote/gateways}/remote_paypal_express_test.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class PaypalExpressTest < Test::Unit::TestCase
   def setup
     Base.gateway_mode = :test
     
-    @gateway = PaypalExpressGateway.new(fixtures(:paypal))
+    @gateway = PaypalExpressGateway.new(fixtures(:paypal_certificate))
   
     @options = {
       :order_id => '230000',
       :email => 'buyer@jadedpallet.com',
-      :address => { :name => 'Fred Brooks',
+      :billing_address => { :name => 'Fred Brooks',
                     :address1 => '1234 Penny Lane',
                     :city => 'Jonsetown',
                     :state => 'NC',

data/test/{remote_tests → remote/gateways}/remote_paypal_test.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class PaypalTest < Test::Unit::TestCase
   def setup
     Base.gateway_mode = :test
     
-    @gateway = PaypalGateway.new(fixtures(:paypal))
+    @gateway = PaypalGateway.new(fixtures(:paypal_certificate))
 
     @creditcard = CreditCard.new(
       :type                => "Visa",
@@ -17,9 +17,9 @@ class PaypalTest < Test::Unit::TestCase
     )
        
     @params = {
-      :order_id => generate_order_id,
+      :order_id => generate_unique_id,
       :email => 'buyer@jadedpallet.com',
-      :address => { :name => 'Fred Brooks',
+      :billing_address => { :name => 'Fred Brooks',
                     :address1 => '1234 Penny Lane',
                     :city => 'Jonsetown',
                     :state => 'NC',
@@ -27,11 +27,10 @@ class PaypalTest < Test::Unit::TestCase
                     :zip => '23456'
                   } ,
       :description => 'Stuff that you purchased, yo!',
-      :ip => '10.0.0.1',
-      :return_url => 'http://example.com/return',
-      :cancel_return_url => 'http://example.com/cancel'
+      :ip => '10.0.0.1'
     }
       
+    @amount = 100
     # test re-authorization, auth-id must be more than 3 days old.
     # each auth-id can only be reauthorized and tested once.
     # leave it commented if you don't want to test reauthorization.
@@ -41,20 +40,27 @@ class PaypalTest < Test::Unit::TestCase
   end
 
   def test_successful_purchase
-    response = @gateway.purchase(300, @creditcard, @params)
+    response = @gateway.purchase(@amount, @creditcard, @params)
+    assert_success response
+    assert response.params['transaction_id']
+  end
+  
+  def test_successful_purchase_with_api_signature
+    gateway = PaypalGateway.new(fixtures(:paypal_signature))
+    response = gateway.purchase(@amount, @creditcard, @params)
     assert_success response
     assert response.params['transaction_id']
   end
   
   def test_failed_purchase
     @creditcard.number = '234234234234'
-    response = @gateway.purchase(300, @creditcard, @params)
+    response = @gateway.purchase(@amount, @creditcard, @params)
     assert_failure response
     assert_nil response.params['transaction_id']
   end
 
   def test_successful_authorization
-    response = @gateway.authorize(300, @creditcard, @params)
+    response = @gateway.authorize(@amount, @creditcard, @params)
     assert_success response
     assert response.params['transaction_id']
     assert_equal '3.00', response.params['amount']
@@ -63,7 +69,7 @@ class PaypalTest < Test::Unit::TestCase
   
   def test_failed_authorization
     @creditcard.number = '234234234234'
-    response = @gateway.authorize(300, @creditcard, @params)
+    response = @gateway.authorize(@amount, @creditcard, @params)
     assert_failure response
     assert_nil response.params['transaction_id']
   end
@@ -89,9 +95,9 @@ class PaypalTest < Test::Unit::TestCase
   end
       
   def test_successful_capture
-    auth = @gateway.authorize(300, @creditcard, @params)
+    auth = @gateway.authorize(@amount, @creditcard, @params)
     assert_success auth
-    response = @gateway.capture(300, auth.authorization)
+    response = @gateway.capture(@amount, auth.authorization)
     assert_success response
     assert response.params['transaction_id']
     assert_equal '3.00', response.params['gross_amount']
@@ -99,19 +105,17 @@ class PaypalTest < Test::Unit::TestCase
   end
   
   def test_successful_voiding
-    auth = @gateway.authorize(300, @creditcard, @params)
+    auth = @gateway.authorize(@amount, @creditcard, @params)
     assert_success auth
     response = @gateway.void(auth.authorization)
     assert_success response
   end
   
   def test_purchase_and_full_credit
-    amount = 300
-    
-    purchase = @gateway.purchase(amount, @creditcard, @params)
+    purchase = @gateway.purchase(@amount, @creditcard, @params)
     assert_success purchase
     
-    credit = @gateway.credit(amount, purchase.authorization, :note => 'Sorry')
+    credit = @gateway.credit(@amount, purchase.authorization, :note => 'Sorry')
     assert_success credit
     assert credit.test?
     assert_equal 'USD',  credit.params['net_refund_amount_currency_id']
@@ -128,10 +132,10 @@ class PaypalTest < Test::Unit::TestCase
   end
   
   def test_successful_transfer
-    response = @gateway.purchase(300, @creditcard, @params)
+    response = @gateway.purchase(@amount, @creditcard, @params)
     assert_success response
     
-    response = @gateway.transfer(300, 'joe@example.com', :subject => 'Your money', :note => 'Thanks for taking care of that')
+    response = @gateway.transfer(@amount, 'joe@example.com', :subject => 'Your money', :note => 'Thanks for taking care of that')
     assert_success response
   end
 
@@ -145,7 +149,7 @@ class PaypalTest < Test::Unit::TestCase
     response = @gateway.purchase(900, @creditcard, @params)
     assert_success response
     
-    response = @gateway.transfer([300, 'joe@example.com'],
+    response = @gateway.transfer([@amount, 'joe@example.com'],
       [600, 'jane@example.com', {:note => 'Thanks for taking care of that'}],
       :subject => 'Your money')
     assert_success response

data/test/{remote_tests → remote/gateways}/remote_plugnpay_test.rb

@@ -1,29 +1,33 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class PlugnpayTest < Test::Unit::TestCase
-  include ActiveMerchant::Billing
-  
   def setup
     @gateway = PlugnpayGateway.new(fixtures(:plugnpay))
-    @good_creditcard = credit_card('4242424242424242')
-    @bad_creditcard = credit_card('1234123412341234')
+    @good_credit_card = credit_card('4242424242424242')
+    @bad_credit_card = credit_card('1234123412341234')
+    @options = {
+      :billing_address => address,
+      :description => 'Store purchaes'
+    }
+    @amount = 100
+    
   end
   
   def test_bad_credit_card
-    assert response = @gateway.authorize(1000, @bad_creditcard)
+    assert response = @gateway.authorize(@amount, @bad_credit_card, @options)
     assert_failure response
     assert_equal 'Invalid Credit Card No.', response.message
   end
   
   def test_good_credit_card
-    assert response = @gateway.authorize(1000, @good_creditcard)
+    assert response = @gateway.authorize(@amount, @good_credit_card, @options)
     assert_success response
     assert !response.authorization.blank?
     assert_equal 'Success', response.message
   end
   
   def test_purchase_transaction
-    assert response = @gateway.purchase(1000, @good_creditcard)        
+    assert response = @gateway.purchase(@amount, @good_credit_card, @options)        
     assert_success response 
     assert !response.authorization.blank?
     assert_equal 'Success', response.message
@@ -33,16 +37,16 @@ class PlugnpayTest < Test::Unit::TestCase
   # In the gateway admin tool, you must add your IP address to the allowed addresses and uncheck "Remote client" under the 
   # "Auth Transactions" section of the "Security Requirements" area in the test account Security Administration Area.
   def test_authorization_and_capture
-    assert authorization = @gateway.authorize(100, @good_creditcard)
+    assert authorization = @gateway.authorize(@amount, @good_credit_card, @options)
     assert_success authorization
     
-    assert capture = @gateway.capture(100, authorization.authorization)
+    assert capture = @gateway.capture(@amount, authorization.authorization)
     assert_success capture
     assert_equal 'Success', capture.message
   end
   
   def test_authorization_and_void
-    assert authorization = @gateway.authorize(100, @good_creditcard)
+    assert authorization = @gateway.authorize(@amount, @good_credit_card, @options)
     assert_success authorization
     
     assert void = @gateway.void(authorization.authorization)
@@ -51,18 +55,16 @@ class PlugnpayTest < Test::Unit::TestCase
   end
   
   def test_purchase_and_credit
-    amount = 100
-    
-    assert purchase = @gateway.purchase(amount, @good_creditcard)
+    assert purchase = @gateway.purchase(@amount, @good_credit_card, @options)
     assert_success purchase
     
-    assert credit = @gateway.credit(amount, purchase.authorization)
+    assert credit = @gateway.credit(@amount, purchase.authorization)
     assert_success credit
     assert_equal 'Success', credit.message
   end
   
   def test_credit_with_no_previous_transaction
-    assert credit = @gateway.credit(100, @good_creditcard)
+    assert credit = @gateway.credit(@amount, @good_credit_card, @options)
     
     assert_success credit
     assert_equal 'Success', credit.message

data/test/{remote_tests → remote/gateways}/remote_protx_test.rb

@@ -1,16 +1,12 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 # Some of the standard tests have been removed at Protx test
 # server is pants and accepts anything and says Status=OK. (shift)
 class RemoteProtxTest < Test::Unit::TestCase
-  include ActiveMerchant::Billing
-  
   # Run the tests in the simulated environment
   # set to false to run the tests in the test environment
   ProtxGateway.simulate = true
   
-  AMOUNT = 100
-
   def setup
     @gateway = ProtxGateway.new(fixtures(:protx))
     
@@ -70,55 +66,59 @@ class RemoteProtxTest < Test::Unit::TestCase
     )
 
     @mastercard_options = { 
-      :address => { :address1 => '25 The Larches',
-                    :city => "Narborough",
-                    :state => "Leicester",
-                    :zip => 'LE10 2RT'
-                  },
-      :order_id => generate_order_id,
+      :billing_address => { 
+        :address1 => '25 The Larches',
+        :city => "Narborough",
+        :state => "Leicester",
+        :zip => 'LE10 2RT'
+      },
+      :order_id => generate_unique_id,
       :description => 'Store purchase'
     }
    
     @maestro_options = {
-      :address => { :address1 => 'The Parkway',
-                    :address2 => "Larches Approach",
-                    :city => "Hull",
-                    :state => "North Humberside",
-                    :zip => 'HU7 9OP'
-                  },
-      :order_id => generate_order_id,
+      :billing_address => { 
+        :address1 => 'The Parkway',
+        :address2 => "Larches Approach",
+        :city => "Hull",
+        :state => "North Humberside",
+        :zip => 'HU7 9OP'
+      },
+      :order_id => generate_unique_id,
       :description => 'Store purchase'
     }
     
     @solo_options = {
-      :address => {
+      :billing_address => {
         :address1 => '5 Zigzag Road',
         :city => 'Isleworth',
         :state => 'Middlesex',
         :zip => 'TW7 8FF'
       },
-      :order_id => generate_order_id,
+      :order_id => generate_unique_id,
       :description => 'Store purchase'
     }
+    
+    @amount = 100
   end
 
   def test_successful_mastercard_purchase
-    assert response = @gateway.purchase(AMOUNT, @mastercard, @mastercard_options)
+    assert response = @gateway.purchase(@amount, @mastercard, @mastercard_options)
     assert_success response
     assert response.test?
     assert !response.authorization.blank?
   end
   
   def test_successful_authorization_and_capture
-    assert auth = @gateway.authorize(AMOUNT, @mastercard, @mastercard_options)
+    assert auth = @gateway.authorize(@amount, @mastercard, @mastercard_options)
     assert_success auth
     
-    assert capture = @gateway.capture(AMOUNT, auth.authorization)
+    assert capture = @gateway.capture(@amount, auth.authorization)
     assert_success capture
   end
   
   def test_successful_authorization_and_void
-    assert auth = @gateway.authorize(AMOUNT, @mastercard, @mastercard_options)
+    assert auth = @gateway.authorize(@amount, @mastercard, @mastercard_options)
     assert_success auth    
      
     assert void = @gateway.void(auth.authorization)
@@ -126,7 +126,7 @@ class RemoteProtxTest < Test::Unit::TestCase
   end
   
   def test_successful_purchase_and_void
-    assert purchase = @gateway.purchase(AMOUNT, @mastercard, @mastercard_options)
+    assert purchase = @gateway.purchase(@amount, @mastercard, @mastercard_options)
     assert_success purchase    
      
     assert void = @gateway.void(purchase.authorization)
@@ -134,38 +134,38 @@ class RemoteProtxTest < Test::Unit::TestCase
   end
   
   def test_successful_purchase_and_credit
-    assert purchase = @gateway.purchase(AMOUNT, @mastercard, @mastercard_options)
+    assert purchase = @gateway.purchase(@amount, @mastercard, @mastercard_options)
     assert_success purchase    
     
-    assert credit = @gateway.credit(AMOUNT, purchase.authorization,
+    assert credit = @gateway.credit(@amount, purchase.authorization,
       :description => 'Crediting trx', 
-      :order_id => generate_order_id
+      :order_id => generate_unique_id
     )
     
     assert_success credit
   end
   
   def test_successful_maestro_purchase
-    assert response = @gateway.purchase(AMOUNT, @maestro, @maestro_options)
+    assert response = @gateway.purchase(@amount, @maestro, @maestro_options)
     assert_success response
   end
   
   def test_successful_solo_purchase
-    assert response = @gateway.purchase(AMOUNT, @solo, @solo_options)
+    assert response = @gateway.purchase(@amount, @solo, @solo_options)
     assert_success response
     assert response.test?
     assert !response.authorization.blank?
   end
   
   def test_successful_amex_purchase
-    assert response = @gateway.purchase(AMOUNT, @amex, :order_id => generate_order_id)   
+    assert response = @gateway.purchase(@amount, @amex, :order_id => generate_unique_id)   
     assert_success response
     assert response.test?
     assert !response.authorization.blank?
   end
   
   def test_successful_electron_purchase
-    assert response = @gateway.purchase(AMOUNT, @electron, :order_id => generate_order_id)   
+    assert response = @gateway.purchase(@amount, @electron, :order_id => generate_unique_id)   
     assert_success response
     assert response.test?
     assert !response.authorization.blank?
@@ -177,7 +177,7 @@ class RemoteProtxTest < Test::Unit::TestCase
     gateway = ProtxGateway.new(
         :login => ''
     )
-    assert response = gateway.purchase(AMOUNT, @mastercard, @mastercard_options)
+    assert response = gateway.purchase(@amount, @mastercard, @mastercard_options)
     assert_equal message, response.message
     assert_failure response
   end

data/test/remote/gateways/remote_psigate_test.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class PsigateRemoteTest < Test::Unit::TestCase
+
+  def setup
+    Base.mode = :test
+    @gateway = PsigateGateway.new(fixtures(:psigate))
+
+    @amount = 2400
+    @creditcard = credit_card('4242424242424242')
+    @options = { 
+      :order_id => generate_unique_id, 
+      :billing_address => address,
+      :email => 'jack@example.com' 
+    }
+  end
+  
+  def test_successful_authorization
+    assert response = @gateway.authorize(@amount, @creditcard, @options)
+    assert_success response
+    assert_equal @options[:order_id], response.authorization
+  end
+  
+  def test_successful_purchase
+    assert response = @gateway.purchase(@amount, @creditcard, @options)
+    assert_success response
+    assert_equal @options[:order_id], response.authorization
+  end
+  
+  def test_successful_authorization_and_capture
+    assert authorization = @gateway.authorize(@amount, @creditcard, @options)
+    assert_success authorization
+    
+    assert capture = @gateway.capture(@amount, authorization.authorization)
+    assert_success capture
+  end
+  
+  def test_successful_purchase_and_credit
+    assert purchase = @gateway.purchase(@amount, @creditcard, @options)
+    assert_success purchase
+    
+    assert credit = @gateway.credit(@amount, purchase.authorization)
+    assert_success credit
+  end
+  
+  def test_failed_purchase
+    assert response = @gateway.purchase(@amount, @creditcard, @options.update(:test_result => 'D'))
+    assert_failure response
+  end
+end

data/test/{remote_tests → remote/gateways}/remote_psl_card_test.rb

@@ -1,14 +1,9 @@
 # Author::    MoneySpyder, http://moneyspyder.co.uk
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class RemotePslCardTest < Test::Unit::TestCase
-  # The test results are determined by the amount of the transaction
-  ACCEPT_AMOUNT = 1000
-  REFERRED_AMOUNT = 6000
-  DECLINED_AMOUNT = 11000
-  KEEP_CARD_AMOUNT = 15000
-
+  
   def setup
     @gateway = PslCardGateway.new(fixtures(:psl_card))
     
@@ -20,19 +15,25 @@ class RemotePslCardTest < Test::Unit::TestCase
     
     @visa = CreditCard.new(fixtures(:psl_visa))
     @visa_address = fixtures(:psl_visa_address)
+    
+    # The test results are determined by the amount of the transaction
+    @accept_amount = 1000
+    @referred_amount = 6000
+    @declined_amount = 11000
+    @keep_card_amount = 15000
   end
   
   def test_successful_visa_purchase
-    response = @gateway.purchase(ACCEPT_AMOUNT, @visa,
-      :address => @visa_address
+    response = @gateway.purchase(@accept_amount, @visa,
+      :billing_address => @visa_address
     )
     assert_success response
     assert response.test?
   end
   
   def test_successful_visa_purchase_specifying_currency
-    response = @gateway.purchase(ACCEPT_AMOUNT, @visa,
-      :address => @visa_address,
+    response = @gateway.purchase(@accept_amount, @visa,
+      :billing_address => @visa_address,
       :currency => 'GBP'
     )
     assert_success response
@@ -40,40 +41,40 @@ class RemotePslCardTest < Test::Unit::TestCase
   end
   
   def test_successful_solo_purchase
-    response = @gateway.purchase(ACCEPT_AMOUNT, @solo, 
-      :address => @solo_address
+    response = @gateway.purchase(@accept_amount, @solo, 
+      :billing_address => @solo_address
     )
     assert_success response
     assert response.test?
   end
   
   def test_referred_purchase
-    response = @gateway.purchase(REFERRED_AMOUNT, @uk_maestro, 
-      :address => @uk_maestro_address
+    response = @gateway.purchase(@referred_amount, @uk_maestro, 
+      :billing_address => @uk_maestro_address
     )
     assert_failure response
     assert response.test?
   end
   
   def test_declined_purchase
-    response = @gateway.purchase(DECLINED_AMOUNT, @uk_maestro, 
-      :address => @uk_maestro_address
+    response = @gateway.purchase(@declined_amount, @uk_maestro, 
+      :billing_address => @uk_maestro_address
     )
     assert_failure response
     assert response.test?
   end
   
   def test_declined_keep_card_purchase
-    response = @gateway.purchase(KEEP_CARD_AMOUNT, @uk_maestro, 
-      :address => @uk_maestro_address
+    response = @gateway.purchase(@keep_card_amount, @uk_maestro, 
+      :billing_address => @uk_maestro_address
     )
     assert_failure response
     assert response.test?
   end
   
   def test_successful_authorization
-    response = @gateway.authorize(ACCEPT_AMOUNT, @uk_maestro, 
-      :address => @uk_maestro_address
+    response = @gateway.authorize(@accept_amount, @uk_maestro, 
+      :billing_address => @uk_maestro_address
     )
     assert_success response
     assert response.test?
@@ -83,21 +84,21 @@ class RemotePslCardTest < Test::Unit::TestCase
     @gateway = PslCardGateway.new(
       :login => ''
     )
-    response = @gateway.authorize(ACCEPT_AMOUNT, @uk_maestro, 
-      :address => @uk_maestro_address
+    response = @gateway.authorize(@accept_amount, @uk_maestro, 
+      :billing_address => @uk_maestro_address
     )
     assert_failure response
     assert response.test?
   end
   
   def test_successful_authorization_and_capture
-    authorization = @gateway.authorize(ACCEPT_AMOUNT, @uk_maestro,
-      :address => @uk_maestro_address
+    authorization = @gateway.authorize(@accept_amount, @uk_maestro,
+      :billing_address => @uk_maestro_address
     )
     assert_success authorization
     assert authorization.test?
     
-    capture = @gateway.capture(ACCEPT_AMOUNT, authorization.authorization)
+    capture = @gateway.capture(@accept_amount, authorization.authorization)
     
     assert_success capture
     assert capture.test?