activemerchant 1.2.1 → 1.3.0

data/test/unit/gateways/eway_test.rb

@@ -6,12 +6,12 @@ class EwayTest < Test::Unit::TestCase
       :login => '87654321'
     )
 
-    @creditcard = credit_card('4646464646464646')
+    @credit_card = credit_card('4646464646464646')
     
-    @test_params_success = {
+    @options = {
       :order_id => '1230123',
       :email => 'bob@testbob.com',
-      :address => {
+      :billing_address => {
         :address1 => '1234 First St.',
         :address2 => 'Apt. 1',
         :city     => 'Melbourne',
@@ -20,37 +20,26 @@ class EwayTest < Test::Unit::TestCase
         :zip      => '12345'
       },
       :description => 'purchased items'
-    }
-   
-    @xml_test_parameters = {
-      :CustomerID => @test_params_success[:login],
-      :CustomerInvoiceRef => @test_params_success[:order_id],
-      :TotalAmount => 100,
-      :CardNumber => @creditcard.number,
-      :CardExpiryMonth => sprintf("%.2i", @creditcard.month),
-      :CardExpiryYear => sprintf("%.4i", @creditcard.year)[-2..-1],
-      :CustomerFirstName => @creditcard.first_name,
-      :CustomerLastName => @creditcard.last_name,
-      :CustomerEmail => @test_params_success[:email],
-      :CustomerAddress => @test_params_success[:address][:address1],
-      :CustomerPostcode => @test_params_success[:address][:zip],
-      :CustomerInvoiceDescription => @test_params_success[:description],
-      :CardHoldersName => @creditcard.name,
-      :TrxnNumber => @test_params_success[:order_id],
-      :Option1 => '',
-      :Option2 => '',
-      :Option3 => ''        
-    }
+    } 
   end
-
-  def test_purchase_exceptions
-    @creditcard.number = 3 
-    
-    assert_raise(Error) do
-      assert response = @gateway.purchase(100, @creditcard, @test_params_success)    
-    end
+  
+  def test_successful_purchase
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
+  
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_success response
+    assert_equal '123456', response.authorization
   end
-       
+  
+  def test_failed_purchase
+    @gateway.expects(:ssl_post).returns(failed_purchase_response)
+  
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_failure response
+  end
+         
   def test_amount_style
    assert_equal '1034', @gateway.send(:amount, 1034)
                                                       
@@ -59,11 +48,6 @@ class EwayTest < Test::Unit::TestCase
    end
   end
   
-  def test_purchase_is_valid_xml
-   assert data = @gateway.send(:post_data, @xml_test_parameters)
-   assert REXML::Document.new(data)
-  end  
-
   def test_ensure_does_not_respond_to_authorize
     assert !@gateway.respond_to?(:authorize)
   end
@@ -90,15 +74,44 @@ class EwayTest < Test::Unit::TestCase
   
   def test_add_address
     post = {}
-    @gateway.send(:add_address, post, @test_params_success)
+    @gateway.send(:add_address, post, @options)
     assert_equal '1234 First St., Apt. 1, Melbourne, ACT, AU', post[:CustomerAddress]
-    assert_equal @test_params_success[:address][:zip], post[:CustomerPostcode]
+    assert_equal @options[:billing_address][:zip], post[:CustomerPostcode]
   end
 
   private
-
-  def xml_purchase_fixture
-    %q{<ewaygateway><ewayCustomerID>87654321</ewayCustomerID><ewayOption3></ewayOption3><ewayCustomerFirstName>Longbob</ewayCustomerFirstName><ewayCustomerAddress>47 Bobway, Bobville, WA, Australia</ewayCustomerAddress><ewayCustomerInvoiceRef>1230123</ewayCustomerInvoiceRef><ewayCardHoldersName>Longbob Longsen</ewayCardHoldersName><ewayTotalAmount>100</ewayTotalAmount><ewayTrxnNumber>1230123</ewayTrxnNumber><ewayCustomerLastName>Longsen</ewayCustomerLastName><ewayCustomerPostcode>2000</ewayCustomerPostcode><ewayCardNumber>4646464646464646</ewayCardNumber><ewayOption1></ewayOption1><ewayCardExpiryMonth>08</ewayCardExpiryMonth><ewayOption2></ewayOption2><ewayCustomerEmail>bob@testbob.com</ewayCustomerEmail><ewayCustomerInvoiceDescription>purchased items</ewayCustomerInvoiceDescription><ewayCardExpiryYear>07</ewayCardExpiryYear></ewaygateway>}
+  def successful_purchase_response
+    <<-XML
+<?xml version="1.0"?>
+<ewayResponse>
+  <ewayTrxnStatus>True</ewayTrxnStatus>
+  <ewayTrxnNumber>11292</ewayTrxnNumber>
+  <ewayTrxnReference/>
+  <ewayTrxnOption1/>
+  <ewayTrxnOption2/>
+  <ewayTrxnOption3/>
+  <ewayAuthCode>123456</ewayAuthCode>
+  <ewayReturnAmount>100</ewayReturnAmount>
+  <ewayTrxnError>00,Transaction Approved(Test CVN Gateway)</ewayTrxnError>
+</ewayResponse>
+    XML
+  end
+  
+  def failed_purchase_response
+    <<-XML
+<?xml version="1.0"?>
+<ewayResponse>
+  <ewayTrxnStatus>False</ewayTrxnStatus>
+  <ewayTrxnNumber>11290</ewayTrxnNumber>
+  <ewayTrxnReference/>
+  <ewayTrxnOption1/>
+  <ewayTrxnOption2/>
+  <ewayTrxnOption3/>
+  <ewayAuthCode/>
+  <ewayReturnAmount>100</ewayReturnAmount>
+  <ewayTrxnError>eWAY Error: Invalid Expiry Date. Your credit card has not been billed for this transaction.(Test CVN Gateway)</ewayTrxnError>
+</ewayResponse>
+    XML
   end
 end
 

data/test/unit/gateways/exact_test.rb

@@ -5,49 +5,41 @@ class ExactTest < Test::Unit::TestCase
     @gateway = ExactGateway.new( :login    => "A00427-01",
                                  :password => "testus" )
 
-    @credit_card = credit_card("4111111111111111")
-    
-    @options = { :address => { :address1 => "1234 Testing Ave.",
-                               :zip      => "55555" } }
+    @credit_card = credit_card
+    @amount = 100
+    @options = { 
+      :order_id => '1',
+      :billing_address => address,
+      :description => 'Store Purchase'
+    }
   end
   
-  def test_successful_request
-    @credit_card.number = "1"
-    assert response = @gateway.purchase(100, @credit_card, {})
+  def test_successful_purchase
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
     assert_success response
-    assert_equal '5555', response.authorization
+    assert_equal 'ET1700;106625152', response.authorization
     assert response.test?
+    assert_equal 'Transaction Normal - VER UNAVAILABLE', response.message
+    
+    ExactGateway::SENSITIVE_FIELDS.each{ |f| assert !response.params.has_key?(f.to_s) }
   end
-
-  def test_unsuccessful_request
-    @credit_card.number = "2"
-    assert response = @gateway.purchase(100, @credit_card, {})
+  
+  def test_failed_purchase
+    @gateway.expects(:ssl_post).returns(failed_purchase_response)
+  
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
     assert_failure response
-    assert response.test?
-  end
-
-  def test_request_error
-    @credit_card.number = "3"
-    assert_raise(Error){ @gateway.purchase(100, @credit_card, {}) }
   end
   
+
   def test_expdate
     assert_equal( "%02d%s" % [ @credit_card.month,
                                @credit_card.year.to_s[-2..-1] ],
                   @gateway.send(:expdate, @credit_card) )
   end
-  
-  def test_successful_purchase
-    @gateway.expects(:ssl_post).returns(successful_purchase_response)
-    assert response = @gateway.purchase(100, @credit_card, {})
-    assert_success response
-    assert_equal 'ET0426;80928103', response.authorization
-    assert response.test?
-    assert_equal 'Transaction Normal - VER UNAVAILABLE', response.message
     
-    ExactGateway::SENSITIVE_FIELDS.each{ |f| assert !response.params.has_key?(f.to_s) }
-  end
-  
   def test_soap_fault
     @gateway.expects(:ssl_post).returns(soap_fault_response)
     assert response = @gateway.purchase(100, @credit_card, {})
@@ -64,42 +56,88 @@ class ExactTest < Test::Unit::TestCase
     assert_equal [:visa, :master, :american_express, :jcb, :discover], ExactGateway.supported_cardtypes
   end
   
+  def test_avs_result
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
+    
+    response = @gateway.purchase(@amount, @credit_card)
+    assert_equal 'U', response.avs_result['code']
+  end
+  
+  def test_cvv_result
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
+    
+    response = @gateway.purchase(@amount, @credit_card)
+    assert_equal 'M', response.cvv_result['code']
+  end
+  
+  
   private
   def successful_purchase_response
     <<-RESPONSE
-<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/" xmlns:types="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><q1:SendAndCommitResponse xmlns:q1="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Response"><SendAndCommitResult href="#id1" /></q1:SendAndCommitResponse><types:TransactionResult id="id1" xsi:type="types:TransactionResult"><ExactID xsi:type="xsd:string">A00427-01</ExactID><Password xsi:type="xsd:string">#######</Password><Transaction_Type xsi:type="xsd:string">00</Transaction_Type><DollarAmount xsi:type="xsd:string">1</DollarAmount><SurchargeAmount xsi:type="xsd:string">0</SurchargeAmount><Card_Number xsi:type="xsd:string">4111111111111111</Card_Number><Verification_Str2 xsi:type="xsd:string">123</Verification_Str2><Transaction_Tag xsi:type="xsd:string">80928103</Transaction_Tag><Authorization_Num xsi:type="xsd:string">ET0426</Authorization_Num><Expiry_Date xsi:type="xsd:string">0909</Expiry_Date><CardHoldersName xsi:type="xsd:string">Active Merchant</CardHoldersName><CVD_Presence_Ind xsi:type="xsd:string">0</CVD_Presence_Ind><ZipCode xsi:type="xsd:string">55555</ZipCode><Secure_AuthRequired xsi:type="xsd:string">0</Secure_AuthRequired><Secure_AuthResult xsi:type="xsd:string">0</Secure_AuthResult><Ecommerce_Flag xsi:type="xsd:string">0</Ecommerce_Flag><CAVV_Algorithm xsi:type="xsd:string">0</CAVV_Algorithm><Language xsi:type="xsd:string">0</Language><LogonMessage xsi:type="xsd:string">Processed by:
-E-xact Transaction Gateway :- Version 8.4.0 B19
-Copyright 2006
-{34:2652}</LogonMessage><Error_Number xsi:type="xsd:string">0</Error_Number><Error_Description xsi:type="xsd:string" /><Transaction_Error xsi:type="xsd:boolean">false</Transaction_Error><Transaction_Approved xsi:type="xsd:boolean">true</Transaction_Approved><EXact_Resp_Code xsi:type="xsd:string">00</EXact_Resp_Code><EXact_Message xsi:type="xsd:string">Transaction Normal</EXact_Message><Bank_Resp_Code xsi:type="xsd:string">00</Bank_Resp_Code><Bank_Message xsi:type="xsd:string">VER UNAVAILABLE </Bank_Message><SequenceNo xsi:type="xsd:string">431</SequenceNo><AVS xsi:type="xsd:string">U</AVS><Retrieval_Ref_No xsi:type="xsd:string">200703280426</Retrieval_Ref_No><MerchantName xsi:type="xsd:string">E-xact ConnectionShop</MerchantName><MerchantAddress xsi:type="xsd:string">Suite 304 - 134 Abbott Street</MerchantAddress><MerchantCity xsi:type="xsd:string">Vancouver</MerchantCity><MerchantProvince xsi:type="xsd:string">BC</MerchantProvince><MerchantCountry xsi:type="xsd:string">Canada</MerchantCountry><MerchantPostal xsi:type="xsd:string">V6B 2K4</MerchantPostal><MerchantURL xsi:type="xsd:string">www.e-xact.com</MerchantURL><CTR xsi:type="xsd:string">========== TRANSACTION RECORD =========
-
-E-xact ConnectionShop
-Suite 304 - 134 Abbott Street
-Vancouver, BC V6B 2K4
-www.e-xact.com
-
-TYPE: Purchase
-
-ACCT: Visa             $1.00 USD
-
-CARD NUMBER : ############1111
-TRANS. REF. : 
-CARD HOLDER : Active Merchant
-EXPIRY DATE : xx/xx
-DATE/TIME   : 28 Mar 07 12:04:26
-REFERENCE # : 5999 431 M
-AUTHOR.#    : ET0426
-
-      Approved - Thank You 00
-
-SIGNATURE
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/" xmlns:types="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><q1:SendAndCommitResponse xmlns:q1="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Response"><SendAndCommitResult href="#id1" /></q1:SendAndCommitResponse><types:TransactionResult id="id1" xsi:type="types:TransactionResult"><ExactID xsi:type="xsd:string">A00427-01</ExactID><Password xsi:type="xsd:string">#######</Password><Transaction_Type xsi:type="xsd:string">00</Transaction_Type><DollarAmount xsi:type="xsd:string">1</DollarAmount><SurchargeAmount xsi:type="xsd:string">0</SurchargeAmount><Card_Number xsi:type="xsd:string">4242424242424242</Card_Number><Transaction_Tag xsi:type="xsd:string">106625152</Transaction_Tag><Authorization_Num xsi:type="xsd:string">ET1700</Authorization_Num><Expiry_Date xsi:type="xsd:string">0909</Expiry_Date><CardHoldersName xsi:type="xsd:string">Longbob Longsen</CardHoldersName><VerificationStr2 xsi:type="xsd:string">123</VerificationStr2><CVD_Presence_Ind xsi:type="xsd:string">1</CVD_Presence_Ind><Secure_AuthRequired xsi:type="xsd:string">0</Secure_AuthRequired><Secure_AuthResult xsi:type="xsd:string">0</Secure_AuthResult><Ecommerce_Flag xsi:type="xsd:string">0</Ecommerce_Flag><CAVV_Algorithm xsi:type="xsd:string">0</CAVV_Algorithm><Reference_No xsi:type="xsd:string">1</Reference_No><Reference_3 xsi:type="xsd:string">Store Purchase</Reference_3><Language xsi:type="xsd:string">0</Language><LogonMessage xsi:type="xsd:string">Processed by: 
+E-xact Transaction Gateway :- Version 8.4.0 B19b 
+Copyright 2006 
+{34:2652}</LogonMessage><Error_Number xsi:type="xsd:string">0</Error_Number><Error_Description xsi:type="xsd:string" /><Transaction_Error xsi:type="xsd:boolean">false</Transaction_Error><Transaction_Approved xsi:type="xsd:boolean">true</Transaction_Approved><EXact_Resp_Code xsi:type="xsd:string">00</EXact_Resp_Code><EXact_Message xsi:type="xsd:string">Transaction Normal</EXact_Message><Bank_Resp_Code xsi:type="xsd:string">00</Bank_Resp_Code><Bank_Message xsi:type="xsd:string">VER UNAVAILABLE </Bank_Message><SequenceNo xsi:type="xsd:string">377</SequenceNo><AVS xsi:type="xsd:string">U</AVS><CVV2 xsi:type="xsd:string">M</CVV2><Retrieval_Ref_No xsi:type="xsd:string">200801181700</Retrieval_Ref_No><MerchantName xsi:type="xsd:string">E-xact ConnectionShop</MerchantName><MerchantAddress xsi:type="xsd:string">Suite 400 - 1152 Mainland St.</MerchantAddress><MerchantCity xsi:type="xsd:string">Vancouver</MerchantCity><MerchantProvince xsi:type="xsd:string">BC</MerchantProvince><MerchantCountry xsi:type="xsd:string">Canada</MerchantCountry><MerchantPostal xsi:type="xsd:string">V6B 4X2</MerchantPostal><MerchantURL xsi:type="xsd:string">www.e-xact.com</MerchantURL><CTR xsi:type="xsd:string">========== TRANSACTION RECORD ========= 
+  
+E-xact ConnectionShop 
+Suite 400 - 1152 Mainland St. 
+Vancouver, BC V6B 4X2 
+www.e-xact.com 
+  
+TYPE: Purchase 
+  
+ACCT: Visa             $1.00 USD 
+  
+CARD NUMBER : ############4242 
+TRANS. REF. : 1 
+CARD HOLDER : Longbob Longsen 
+EXPIRY DATE : xx/xx 
+DATE/TIME   : 18 Jan 08 14:17:00 
+REFERENCE # : 5999 377 M 
+AUTHOR.#    : ET1700 
+  
+      Approved - Thank You 00 
+  
+SIGNATURE 
 
 
 
-_______________________________________
+_______________________________________ 
 
 </CTR></types:TransactionResult></soap:Body></soap:Envelope>
     RESPONSE
   end
+  
+  def failed_purchase_response
+    <<-RESPONSE
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/" xmlns:types="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><q1:SendAndCommitResponse xmlns:q1="http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Response"><SendAndCommitResult href="#id1" /></q1:SendAndCommitResponse><types:TransactionResult id="id1" xsi:type="types:TransactionResult"><ExactID xsi:type="xsd:string">A00427-01</ExactID><Password xsi:type="xsd:string">#######</Password><Transaction_Type xsi:type="xsd:string">00</Transaction_Type><DollarAmount xsi:type="xsd:string">5013</DollarAmount><SurchargeAmount xsi:type="xsd:string">0</SurchargeAmount><Card_Number xsi:type="xsd:string">4111111111111111</Card_Number><Transaction_Tag xsi:type="xsd:string">106624668</Transaction_Tag><Expiry_Date xsi:type="xsd:string">0909</Expiry_Date><CardHoldersName xsi:type="xsd:string">Longbob Longsen</CardHoldersName><VerificationStr2 xsi:type="xsd:string">123</VerificationStr2><CVD_Presence_Ind xsi:type="xsd:string">1</CVD_Presence_Ind><Secure_AuthRequired xsi:type="xsd:string">0</Secure_AuthRequired><Secure_AuthResult xsi:type="xsd:string">0</Secure_AuthResult><Ecommerce_Flag xsi:type="xsd:string">0</Ecommerce_Flag><CAVV_Algorithm xsi:type="xsd:string">0</CAVV_Algorithm><Reference_No xsi:type="xsd:string">1</Reference_No><Reference_3 xsi:type="xsd:string">Store Purchase</Reference_3><Language xsi:type="xsd:string">0</Language><LogonMessage xsi:type="xsd:string">Processed by: 
+E-xact Transaction Gateway :- Version 8.4.0 B19b 
+Copyright 2006 
+{34:2652}</LogonMessage><Error_Number xsi:type="xsd:string">0</Error_Number><Error_Description xsi:type="xsd:string" /><Transaction_Error xsi:type="xsd:boolean">false</Transaction_Error><Transaction_Approved xsi:type="xsd:boolean">false</Transaction_Approved><EXact_Resp_Code xsi:type="xsd:string">00</EXact_Resp_Code><EXact_Message xsi:type="xsd:string">Transaction Normal</EXact_Message><Bank_Resp_Code xsi:type="xsd:string">13</Bank_Resp_Code><Bank_Message xsi:type="xsd:string">AMOUNT ERR</Bank_Message><SequenceNo xsi:type="xsd:string">376</SequenceNo><AVS xsi:type="xsd:string">U</AVS><CVV2 xsi:type="xsd:string">M</CVV2><MerchantName xsi:type="xsd:string">E-xact ConnectionShop</MerchantName><MerchantAddress xsi:type="xsd:string">Suite 400 - 1152 Mainland St.</MerchantAddress><MerchantCity xsi:type="xsd:string">Vancouver</MerchantCity><MerchantProvince xsi:type="xsd:string">BC</MerchantProvince><MerchantCountry xsi:type="xsd:string">Canada</MerchantCountry><MerchantPostal xsi:type="xsd:string">V6B 4X2</MerchantPostal><MerchantURL xsi:type="xsd:string">www.e-xact.com</MerchantURL><CTR xsi:type="xsd:string">========== TRANSACTION RECORD ========= 
+  
+E-xact ConnectionShop 
+Suite 400 - 1152 Mainland St. 
+Vancouver, BC V6B 4X2 
+www.e-xact.com 
+  
+TYPE: Purchase 
+  
+ACCT: Visa             $5,013.00 USD 
+  
+CARD NUMBER : ############1111 
+TRANS. REF. : 1 
+CARD HOLDER : Longbob Longsen 
+EXPIRY DATE : xx/xx 
+DATE/TIME   : 18 Jan 08 14:11:09 
+REFERENCE # : 5999 376 M 
+AUTHOR.#    : 
+  
+      Transaction not Approved 13 
+  
+
+</CTR></types:TransactionResult></soap:Body></soap:Envelope>    
+    RESPONSE
+  end
 
   def soap_fault_response
     <<-RESPONSE

data/test/unit/gateways/gateway_test.rb

@@ -21,4 +21,11 @@ class Gateway < Test::Unit::TestCase
     assert_false Gateway.new.test?
   end
   
+  def test_amount_style
+   assert_equal '10.34', Gateway.new.send(:amount, 1034)
+
+   assert_raise(ArgumentError) do
+     Gateway.new.send(:amount, '10.34')
+   end
+  end
 end

data/test/unit/gateways/linkpoint_test.rb

@@ -1,21 +1,18 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
-class LinkpointResponseTest < Test::Unit::TestCase
+class LinkpointTest < Test::Unit::TestCase
   def setup
-    Base.gateway_mode = :test
+    Base.mode = :test
     
     @gateway = LinkpointGateway.new(
       :login => 123123,
       :pem => 'PEM'
     )
 
-    @creditcard = credit_card('4111111111111111')
+    @credit_card = credit_card('4111111111111111')
+    @options = { :order_id => 1000, :billing_address => address }
   end
   
-  def teardown
-    Base.gateway_mode = :test
-  end
-
   def test_credit_card_formatting
     assert_equal '04', @gateway.send(:format_creditcard_expiry_year, 2004)
     assert_equal '04', @gateway.send(:format_creditcard_expiry_year, '2004')
@@ -23,51 +20,36 @@ class LinkpointResponseTest < Test::Unit::TestCase
     assert_equal '04', @gateway.send(:format_creditcard_expiry_year, '04')
   end
   
-  def test_authorize
-    @creditcard.number = '1'
+  def test_successful_authorization
+    @gateway.expects(:ssl_post).returns(successful_authorization_response)
     
-    assert response = @gateway.authorize(2400, @creditcard, :order_id => 1000, 
-      :address1 => '1313 lucky lane',
-      :city => 'Lost Angeles',
-      :state => 'CA',
-      :zip => '90210'
-    )
-    assert_equal Response, response.class
-    assert_equal true, response.success?
+    assert response = @gateway.authorize(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_success response
+    assert_equal '1000', response.authorization
   end
   
-  def test_purchase_success
-    @creditcard.number = '1'
+  def test_successful_purchase
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
     
-    assert response = @gateway.purchase(2400, @creditcard, :order_id => 1001,
-      :address1 => '1313 lucky lane',
-      :city => 'Lost Angeles',
-      :state => 'CA',
-      :zip => '90210'
-    )
-    assert_equal Response, response.class
-    assert_equal true, response.success?
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_success response
+    assert_equal '1000', response.authorization
   end
   
-  def test_purchase_decline
-    @creditcard.number = '2'
+  def test_failed_purchase
+    @gateway.expects(:ssl_post).returns(failed_purchase_response)
     
-    @gateway = LinkpointGateway.new(
-      :login => 123123,
-      :pem   => 'PEM'
-    )
-
-    assert response = @gateway.purchase(100, @creditcard, :order_id => 1002)
-    assert_equal Response, response.class
-    assert_equal false, response.success?
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_failure response
   end
   
   def test_recurring
-    @creditcard.number = '1'
+    @gateway.expects(:ssl_post).returns(successful_recurring_response)
     
-    assert response = @gateway.recurring(2400, @creditcard, :order_id => 1003, :installments => 12, :startdate => "immediate", :periodicity => :monthly)
-    assert_equal Response, response.class
-    assert_equal true, response.success?
+    assert response = @gateway.recurring(2400, @credit_card, :order_id => 1003, :installments => 12, :startdate => "immediate", :periodicity => :monthly)
+    assert_success response
   end
   
   def test_amount_style
@@ -77,19 +59,9 @@ class LinkpointResponseTest < Test::Unit::TestCase
      @gateway.send(:amount, '10.34')
    end
   end
-end
-
-
-class LinkpointRequestTest < Test::Unit::TestCase
-  def setup
-    @gateway = LinkpointGateway.new(:login => 123123, :pem => 'PEM')
-
-    @creditcard = credit_card('4111111111111111')
-  end
-
 
   def test_purchase_is_valid_xml
-    parameters = @gateway.send(:parameters, 1000, @creditcard, :ordertype => "SALE", :order_id => 1004,
+    parameters = @gateway.send(:parameters, 1000, @credit_card, :ordertype => "SALE", :order_id => 1004,
       :billing_address => {
         :address1 => '1313 lucky lane',
         :city => 'Lost Angeles',
@@ -98,13 +70,12 @@ class LinkpointRequestTest < Test::Unit::TestCase
       }
     )
   
-    assert data = @gateway.send(:post_data, parameters)
+    assert data = @gateway.send(:post_data, @amount, @credit_card, @options)
     assert REXML::Document.new(data)
   end
-
   
   def test_recurring_is_valid_xml
-    parameters = @gateway.send(:parameters, 1000, @creditcard, :ordertype => "SALE", :action => "SUBMIT", :installments => 12, :startdate => "immediate", :periodicity => "monthly", :order_id => 1006,
+    parameters = @gateway.send(:parameters, 1000, @credit_card, :ordertype => "SALE", :action => "SUBMIT", :installments => 12, :startdate => "immediate", :periodicity => "monthly", :order_id => 1006,
       :billing_address => {
         :address1 => '1313 lucky lane',
         :city => 'Lost Angeles',
@@ -112,14 +83,14 @@ class LinkpointRequestTest < Test::Unit::TestCase
         :zip => '90210'
       }
     )
-    assert data = @gateway.send(:post_data, parameters)
+    assert data = @gateway.send(:post_data, @amount, @credit_card, @options)
     assert REXML::Document.new(data)
   end
 
   def test_declined_purchase_is_valid_xml
     @gateway = LinkpointGateway.new(:login => 123123, :pem => 'PEM')
     
-    parameters = @gateway.send(:parameters, 1000, @creditcard, :ordertype => "SALE", :order_id => 1005,
+    parameters = @gateway.send(:parameters, 1000, @credit_card, :ordertype => "SALE", :order_id => 1005,
       :billing_address => {
         :address1 => '1313 lucky lane',
         :city => 'Lost Angeles',
@@ -128,7 +99,7 @@ class LinkpointRequestTest < Test::Unit::TestCase
       }
     )
   
-    assert data = @gateway.send(:post_data, parameters)
+    assert data = @gateway.send(:post_data, @amount, @credit_card, @options)
     assert REXML::Document.new(data)
   end
   
@@ -162,4 +133,35 @@ class LinkpointRequestTest < Test::Unit::TestCase
   def test_supported_card_types
     assert_equal [:visa, :master, :american_express, :discover], LinkpointGateway.supported_cardtypes
   end
+  
+  def test_avs_result
+    @gateway.expects(:ssl_post).returns(successful_authorization_response)
+    
+    response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_equal 'N', response.avs_result['code']
+  end
+  
+  def test_cvv_result
+    @gateway.expects(:ssl_post).returns(successful_authorization_response)
+    
+    response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_equal 'M', response.cvv_result['code']
+  end
+  
+  private
+  def successful_authorization_response
+    '<r_csp>CSI</r_csp><r_time>Sun Jan 6 21:41:31 2008</r_time><r_ref>0004486182</r_ref><r_error/><r_ordernum>1000</r_ordernum><r_message>APPROVED</r_message><r_code>1234560004486182:NNNM:100018312899:</r_code><r_tdate>1199680890</r_tdate><r_score/><r_authresponse/><r_approved>APPROVED</r_approved><r_avs>NNNM</r_avs>'
+  end
+  
+  def successful_purchase_response
+    '<r_csp>CSI</r_csp><r_time>Sun Jan 6 21:45:22 2008</r_time><r_ref>0004486195</r_ref><r_error></r_error><r_ordernum>1000</r_ordernum><r_message>APPROVED</r_message><r_code>1234560004486195:NNNM:100018312912:</r_code><r_tdate>1199681121</r_tdate><r_score></r_score><r_authresponse></r_authresponse><r_approved>APPROVED</r_approved><r_avs>NNNM</r_avs>'    
+  end
+  
+  def failed_purchase_response
+    '<r_csp></r_csp><r_time>Sun Jan 6 21:50:51 2008</r_time><r_ref></r_ref><r_error>SGS-002300: Invalid credit card type.</r_error><r_ordernum>2aec6babe076111deb2c94c21181d9fe</r_ordernum><r_message></r_message><r_code></r_code><r_tdate></r_tdate><r_score></r_score><r_authresponse></r_authresponse><r_approved>DECLINED</r_approved><r_avs></r_avs>'
+  end
+  
+  def successful_recurring_response
+    '<r_csp>CSI</r_csp><r_time>Sun Jan 6 21:49:00 2008</r_time><r_ref>0004486198</r_ref><r_error></r_error><r_ordernum>2206b7c9a31de5fb077913134011059d</r_ordernum><r_message>APPROVED</r_message><r_code>1234560004486198:NNNM:100018312915:</r_code><r_tdate>1199681339</r_tdate><r_score></r_score><r_authresponse></r_authresponse><r_approved>APPROVED</r_approved><r_avs>NNN</r_avs>'
+  end
 end