killbill-paypal-express 5.0.0 → 5.0.1

data/spec/paypal_express/remote/hpp_spec.rb

@@ -53,7 +53,7 @@ shared_examples 'hpp_spec_common' do
     end
 
     # Each loop triggers one successful purchase and one successful refund
-    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 5 * n
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 1 + 8 * n
   end
 
@@ -116,7 +116,7 @@ shared_examples 'hpp_spec_common' do
     end
 
     # Each loop triggers one successful purchase and one successful refund
-    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 5 * n
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 1 + 9 * n
   end
 
@@ -184,7 +184,7 @@ shared_examples 'hpp_spec_common' do
     end
 
     # Each loop triggers one successful auth, one successful capture and one successful refund
-    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 3 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 5 * n
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 1 + 15 * n / 2 + 7 * n % 2
   end
 
@@ -224,8 +224,8 @@ shared_examples 'hpp_spec_common' do
       @plugin.kb_apis.proxied_services[:payment_api].payments.size.should == i / 2
     end
 
-    # Each loop triggers one successful authorize and one successful void
-    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
+    # Each loop triggers one successful details_for, authorize and void
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 3 * n
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 9 * n / 2 + 5 * n % 2
   end
 

data/spec/paypal_express/remote/hpp_spec_helpers.rb

@@ -55,15 +55,26 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        payment_infos.size.should == 1
+        payment_infos.size.should == 2
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :PURCHASE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
         find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # purchase
+        payment_infos[1].kb_payment_id.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :PURCHASE
+        payment_infos[1].amount.should == @amount
+        payment_infos[1].currency.should == @currency
+        payment_infos[1].status.should == :PROCESSED
+        payment_infos[1].gateway_error.should == 'Success'
+        payment_infos[1].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
 
         # Try a full refund
         refund_response = @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, [], @call_context)
@@ -73,21 +84,33 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        payment_infos.size.should == 2
+        payment_infos.size.should == 3
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :PURCHASE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
-        payment_infos[1].kb_payment_id.should.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :REFUND
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # purchase
+        payment_infos[1].kb_payment_id.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :PURCHASE
         payment_infos[1].amount.should == @amount
         payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
+        # refund
+        payment_infos[2].kb_payment_id.should.should == kb_payment_id
+        payment_infos[2].transaction_type.should == :REFUND
+        payment_infos[2].amount.should == @amount
+        payment_infos[2].currency.should == @currency
+        payment_infos[2].status.should == :PROCESSED
+        payment_infos[2].gateway_error.should == 'Success'
+        payment_infos[2].gateway_error_code.should be_nil
       end
 
       def authorize_capture_and_refund(kb_payment_id, payment_external_key, properties, payment_processor_account_id)
@@ -101,18 +124,29 @@ module Killbill
 
         # Verify GET AUTHORIZED PAYMENT
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 1
+        payment_infos.size.should == 2
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
         find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
-        find_value_from_properties(payment_infos[0].properties, 'paymentInfoPaymentStatus').should == 'Pending'
-        find_value_from_properties(payment_infos[0].properties, 'paymentInfoPendingReason').should == 'authorization'
-        find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
+        payment_infos[1].kb_payment_id.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].amount.should == @amount
+        payment_infos[1].currency.should == @currency
+        payment_infos[1].status.should == :PROCESSED
+        payment_infos[1].gateway_error.should == 'Success'
+        payment_infos[1].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[1].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[1].properties, 'paymentInfoPaymentStatus').should == 'Pending'
+        find_value_from_properties(payment_infos[1].properties, 'paymentInfoPendingReason').should == 'authorization'
+        find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == payment_processor_account_id
 
         # Trigger the capture
         payment_response = @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, payment_external_key, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
@@ -123,24 +157,36 @@ module Killbill
         # Verify GET CAPTURED PAYMENT
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
         # Two expected transactions: one auth and one capture
-        payment_infos.size.should == 2
+        payment_infos.size.should == 3
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
-        find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :CAPTURE
+        payment_infos[1].transaction_type.should == :AUTHORIZE
         payment_infos[1].amount.should == @amount
         payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
-        find_value_from_properties(payment_infos[1].properties, 'paymentInfoPaymentStatus').should == 'Completed'
         find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        #capture
+        payment_infos[2].kb_payment_id.should == kb_payment_id
+        payment_infos[2].transaction_type.should == :CAPTURE
+        payment_infos[2].amount.should == @amount
+        payment_infos[2].currency.should == @currency
+        payment_infos[2].status.should == :PROCESSED
+        payment_infos[2].gateway_error.should == 'Success'
+        payment_infos[2].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[2].properties, 'paymentInfoPaymentStatus').should == 'Completed'
+        find_value_from_properties(payment_infos[2].properties, 'payment_processor_account_id').should == payment_processor_account_id
 
         # Try a full refund
         refund_response = @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, [], @call_context)
@@ -150,31 +196,44 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 3
+        payment_infos.size.should == 4
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
-        find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :CAPTURE
+        payment_infos[1].transaction_type.should == :AUTHORIZE
         payment_infos[1].amount.should == @amount
         payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
         find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == payment_processor_account_id
-        payment_infos[2].kb_payment_id.should.should == kb_payment_id
-        payment_infos[2].transaction_type.should == :REFUND
+        # capture
+        payment_infos[2].kb_payment_id.should == kb_payment_id
+        payment_infos[2].transaction_type.should == :CAPTURE
         payment_infos[2].amount.should == @amount
         payment_infos[2].currency.should == @currency
         payment_infos[2].status.should == :PROCESSED
         payment_infos[2].gateway_error.should == 'Success'
         payment_infos[2].gateway_error_code.should be_nil
         find_value_from_properties(payment_infos[2].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        # refund
+        payment_infos[3].kb_payment_id.should.should == kb_payment_id
+        payment_infos[3].transaction_type.should == :REFUND
+        payment_infos[3].amount.should == @amount
+        payment_infos[3].currency.should == @currency
+        payment_infos[3].status.should == :PROCESSED
+        payment_infos[3].gateway_error.should == 'Success'
+        payment_infos[3].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[3].properties, 'payment_processor_account_id').should == payment_processor_account_id
       end
 
       def authorize_and_double_capture(kb_payment_id, payment_external_key, properties)
@@ -183,16 +242,29 @@ module Killbill
         payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
         payment_response.amount.should == @amount
         payment_response.transaction_type.should == :AUTHORIZE
+        payer_id = find_value_from_properties(payment_response.properties, 'payerId')
+        payer_id.should_not be_nil
 
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 1
+        payment_infos.size.should == 2
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # autorize
+        payment_infos[1].kb_payment_id.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].amount.should == @amount
+        payment_infos[1].currency.should == @currency
+        payment_infos[1].status.should == :PROCESSED
+        payment_infos[1].gateway_error.should == 'Success'
+        payment_infos[1].gateway_error_code.should be_nil
 
         # Trigger the capture
         payment_response = @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, payment_external_key, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
@@ -201,21 +273,33 @@ module Killbill
         payment_response.transaction_type.should == :CAPTURE
 
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 2
+        payment_infos.size.should == 3
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # autorize
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :CAPTURE
+        payment_infos[1].transaction_type.should == :AUTHORIZE
         payment_infos[1].amount.should == @amount
         payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
+        # capture
+        payment_infos[2].kb_payment_id.should == kb_payment_id
+        payment_infos[2].transaction_type.should == :CAPTURE
+        payment_infos[2].amount.should == @amount
+        payment_infos[2].currency.should == @currency
+        payment_infos[2].status.should == :PROCESSED
+        payment_infos[2].gateway_error.should == 'Success'
+        payment_infos[2].gateway_error_code.should be_nil
 
         # Trigger a capture again with full amount
         payment_response = @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, payment_external_key, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
@@ -224,28 +308,41 @@ module Killbill
         payment_response.transaction_type.should == :CAPTURE
 
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 3
+        payment_infos.size.should == 4
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :CAPTURE
+        payment_infos[1].transaction_type.should == :AUTHORIZE
         payment_infos[1].amount.should == @amount
         payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
-        payment_infos[2].kb_payment_id.should.should == kb_payment_id
+        # capture
+        payment_infos[2].kb_payment_id.should == kb_payment_id
         payment_infos[2].transaction_type.should == :CAPTURE
-        payment_infos[2].amount.should be_nil
-        payment_infos[2].currency.should be_nil
-        payment_infos[2].status.should == :ERROR
-        payment_infos[2].gateway_error.should == 'Authorization has already been completed.'
+        payment_infos[2].amount.should == @amount
+        payment_infos[2].currency.should == @currency
+        payment_infos[2].status.should == :PROCESSED
+        payment_infos[2].gateway_error.should == 'Success'
         payment_infos[2].gateway_error_code.should be_nil
+        # capture again
+        payment_infos[3].kb_payment_id.should.should == kb_payment_id
+        payment_infos[3].transaction_type.should == :CAPTURE
+        payment_infos[3].amount.should be_nil
+        payment_infos[3].currency.should be_nil
+        payment_infos[3].status.should == :ERROR
+        payment_infos[3].gateway_error.should == 'Authorization has already been completed.'
+        payment_infos[3].gateway_error_code.should == "10602"
       end
 
       def authorize_and_void(kb_payment_id, payment_external_key, properties, payment_processor_account_id)
@@ -254,18 +351,31 @@ module Killbill
         payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
         payment_response.amount.should == @amount
         payment_response.transaction_type.should == :AUTHORIZE
+        payer_id = find_value_from_properties(payment_response.properties, 'payerId')
+        payer_id.should_not be_nil
 
         # Verify get_payment_info
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 1
+        payment_infos.size.should == 2
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
-        find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
+        payment_infos[1].kb_payment_id.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].amount.should == @amount
+        payment_infos[1].currency.should == @currency
+        payment_infos[1].status.should == :PROCESSED
+        payment_infos[1].gateway_error.should == 'Success'
+        payment_infos[1].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == payment_processor_account_id
 
         # Trigger the void
         payment_response = @plugin.void_payment(@pm.kb_account_id, kb_payment_id, payment_external_key, @pm.kb_payment_method_id, properties, @call_context)
@@ -274,42 +384,54 @@ module Killbill
 
         # Verify get_payment_info
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        # Two expected transactions: one auth and one capture
-        payment_infos.size.should == 2
+        # Two expected transactions: one auth and one capture, plus the details call
+        payment_infos.size.should == 3
+        # details_for
         payment_infos[0].kb_payment_id.should == kb_payment_id
         payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should == @amount
-        payment_infos[0].currency.should == @currency
+        payment_infos[0].amount.should be_nil
+        payment_infos[0].currency.should be_nil
         payment_infos[0].status.should == :PROCESSED
         payment_infos[0].gateway_error.should == 'Success'
         payment_infos[0].gateway_error_code.should be_nil
-        find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
+        find_value_from_properties(payment_infos[0].properties, 'payerName').should_not be_nil
+        # authorize
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :VOID
+        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].amount.should == @amount
+        payment_infos[1].currency.should == @currency
         payment_infos[1].status.should == :PROCESSED
         payment_infos[1].gateway_error.should == 'Success'
         payment_infos[1].gateway_error_code.should be_nil
         find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == payment_processor_account_id
+        # void
+        payment_infos[2].kb_payment_id.should == kb_payment_id
+        payment_infos[2].transaction_type.should == :VOID
+        payment_infos[2].status.should == :PROCESSED
+        payment_infos[2].gateway_error.should == 'Success'
+        payment_infos[2].gateway_error_code.should be_nil
+        find_value_from_properties(payment_infos[2].properties, 'payment_processor_account_id').should == payment_processor_account_id
       end
 
       def purchase_with_missing_token
-        failed_purchase([], :CANCELED, 'Could not find the payer_id: the token is missing', 'RuntimeError')
+        failed_purchase([], :CANCELED, 'Could not retrieve the payer info: the token is missing', 'RuntimeError')
       end
 
       def authorize_with_missing_token
-        failed_authorize([], :CANCELED, 'Could not find the payer_id: the token is missing', 'RuntimeError')
+        failed_authorize([], :CANCELED, 'Could not retrieve the payer info: the token is missing', 'RuntimeError')
       end
 
       def purchase_with_invalid_token(purchase_properties)
-        failed_purchase(purchase_properties, :CANCELED, "Could not find the payer_id for token #{properties_to_hash(purchase_properties)[:token]}", 'RuntimeError')
+        failed_purchase(purchase_properties, :CANCELED, "Could not retrieve the payer info for token #{properties_to_hash(purchase_properties)[:token]}", 'RuntimeError')
       end
 
       def authorize_with_invalid_token(authorize_properties)
-        failed_authorize(authorize_properties, :CANCELED, "Could not find the payer_id for token #{properties_to_hash(authorize_properties)[:token]}", 'RuntimeError')
+        failed_authorize(authorize_properties, :CANCELED, "Could not retrieve the payer info for token #{properties_to_hash(authorize_properties)[:token]}", 'RuntimeError')
       end
 
       def subsequent_purchase(purchase_properties)
-        failed_purchase(purchase_properties, :ERROR, 'A successful transaction has already been completed for this token.')
+        failed_purchase(purchase_properties, :ERROR, 'A successful transaction has already been completed for this token.', '11607')
       end
 
       def failed_authorize(authorize_properties, status, msg, gateway_error_code=nil)
@@ -322,14 +444,15 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        payment_infos.size.should == 1
-        payment_infos[0].kb_payment_id.should == kb_payment_id
-        payment_infos[0].transaction_type.should == :AUTHORIZE
-        payment_infos[0].amount.should be_nil
-        payment_infos[0].currency.should be_nil
-        payment_infos[0].status.should == status
-        payment_infos[0].gateway_error.should == msg
-        payment_infos[0].gateway_error_code.should == gateway_error_code
+        # we might have an extra details_for call
+        payment_infos.size.should be_in([1, 2])
+        payment_infos[-1].kb_payment_id.should == kb_payment_id
+        payment_infos[-1].transaction_type.should == :AUTHORIZE
+        payment_infos[-1].amount.should be_nil
+        payment_infos[-1].currency.should be_nil
+        payment_infos[-1].status.should == status
+        payment_infos[-1].gateway_error.should == msg
+        payment_infos[-1].gateway_error_code.should == gateway_error_code
       end
 
       def failed_purchase(purchase_properties, status, msg, gateway_error_code=nil)
@@ -342,14 +465,16 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        payment_infos.size.should == 1
-        payment_infos[0].kb_payment_id.should == kb_payment_id
-        payment_infos[0].transaction_type.should == :PURCHASE
-        payment_infos[0].amount.should be_nil
-        payment_infos[0].currency.should be_nil
-        payment_infos[0].status.should == status
-        payment_infos[0].gateway_error.should == msg
-        payment_infos[0].gateway_error_code.should == gateway_error_code
+        token = find_value_from_properties(purchase_properties, 'token')
+        # we might have an extra details_for call
+        payment_infos.size.should be_in([1, 2])
+        payment_infos[-1].kb_payment_id.should == kb_payment_id
+        payment_infos[-1].transaction_type.should == :PURCHASE
+        payment_infos[-1].amount.should be_nil
+        payment_infos[-1].currency.should be_nil
+        payment_infos[-1].status.should == status
+        payment_infos[-1].gateway_error.should == msg
+        payment_infos[-1].gateway_error_code.should == gateway_error_code
       end
 
       private