killbill-paypal-express 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913eedcc9a3244894dd570f66b759d51108ba7c6
-  data.tar.gz: dd6bfb8b20f9d073d4e001588bd7c0d10a0646f2
+  metadata.gz: 588915d1b5f301d56b925a8c75f5f643c2725562
+  data.tar.gz: c0025ed6f693a9f726645ca22f368d396457ef07
 SHA512:
-  metadata.gz: d90e70548f11dc0881ed4005f8e254a1c1f72a0eea876d20e6fe635cbfd15519d91891f94b2bb0abd1f505356eb9e025275281750d235160995c39c950b8813d
-  data.tar.gz: 93a62549de619d9d5bae207e1afaeb93080d5c6547436d21a964256cf936b28d514039e2b4f183eab4b328b8f6b6475ffc860471afd030aa21d9d701e87f7f13
+  metadata.gz: 9717c0e506aa81b724132330923b2c4778335482ecce4a7f3c1f3f05387598401ba8ad63a196408a1a393fa7e5a2cf8e6861f0090bdc7f4dfc6255f621871fd3
+  data.tar.gz: 2428403edb96d25c5e373f762e2dd013eb464bd0f6765df1e89b2952984bed239ce3c5062888636fc19fc1a3f6ec6d4e2653964d8d4ac0d9d2045952fb46ee4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-paypal-express (5.0.2)
+    killbill-paypal-express (5.0.3)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)

data/NEWS

@@ -1,3 +1,6 @@
+5.0.3
+    Fix for https://github.com/killbill/killbill-paypal-express-plugin/issues/26
+
 5.0.2
     Make text on checkout button configurable (through review plugin property)
 

data/VERSION

@@ -1 +1 @@
-5.0.2
+5.0.3

data/lib/paypal_express/api.rb

@@ -84,7 +84,14 @@ module Killbill #:nodoc:
       end
 
       def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-        t_info_plugins = super(kb_account_id, kb_payment_id, properties, context)
+        ignored_api_calls = [:details_for]
+        responses = @response_model.from_kb_payment_id(@transaction_model, kb_payment_id, context.tenant_id)
+        responses = responses.reject do |response|
+          ignored_api_calls.include?(response.api_call.to_sym)
+        end
+        t_info_plugins = responses.collect do |response|
+          response.to_transaction_info_plugin(response.send("#{@identifier}_transaction"))
+        end
         # Should never happen...
         return [] if t_info_plugins.nil?
 
@@ -288,7 +295,8 @@ module Killbill #:nodoc:
         payment_processor_account_id = payment_processor_account_id || :default
         gateway                      = lookup_gateway(payment_processor_account_id, kb_tenant_id)
         gw_response                  = gateway.details_for(token)
-        response, transaction        = save_response_and_transaction(gw_response, :details_for, kb_account_id, kb_tenant_id, payment_processor_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type)
+
+        response = @response_model.create_response(:details_for, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response)
 
         raise response.message unless response.success?
         raise "Could not retrieve the payer info for token #{token}" if response.payer_id.blank?

data/lib/paypal_express/models/response.rb

@@ -63,6 +63,13 @@ module Killbill #:nodoc:
               model)
       end
 
+      def self.create_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, extra_params = {}, model = ::Killbill::PaypalExpress::PaypalExpressResponse)
+        response = model.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, extra_params, model)
+        response.save!(shared_activerecord_options)
+        response
+      end
+
+
       def self.last_token(kb_account_id, kb_tenant_id)
         response = where(:api_call => 'initiate_express_checkout',
                          :success => true,

data/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>5.0.2</version>
+    <version>5.0.3</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing Paypal Express Checkout as a payment gateway</description>

data/spec/paypal_express/remote/baid_spec.rb

@@ -21,27 +21,18 @@ shared_examples 'baid_spec_common' do
     payer_id = find_value_from_properties(payment_response.properties, 'payerId')
     payer_id.should_not be_nil
 
+    validate_details_for(@kb_payment.id, :PURCHASE, payer_id)
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 2
-    # details_for
+    payment_infos.size.should == 1
+    # purchase
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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, 'payment_processor_account_id').should == @payment_processor_account_id
     find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
 
@@ -53,34 +44,24 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 3
-    # details_for
+    payment_infos.size.should == 2
+    # purchase
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    # refund
     payment_infos[1].kb_payment_id.should == @kb_payment.id
-    payment_infos[1].transaction_type.should == :PURCHASE
+    payment_infos[1].transaction_type.should == :REFUND
     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, 'payment_processor_account_id').should == @payment_processor_account_id
-    # refund
-    payment_infos[2].kb_payment_id.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
     find_value_from_properties(payment_infos[1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
@@ -92,27 +73,18 @@ shared_examples 'baid_spec_common' do
     payer_id = find_value_from_properties(payment_response.properties, 'payerId')
     payer_id.should_not be_nil
 
+    validate_details_for(@kb_payment.id, :AUTHORIZE, payer_id)
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 2
-    # details_for
+    payment_infos.size.should == 1
+    # purchase
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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 == :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[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     find_value_from_properties(payment_infos[0].properties, 'payerId').should == payer_id
 
@@ -126,15 +98,15 @@ shared_examples 'baid_spec_common' do
 
       # Verify GET API
       payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-      payment_infos.size.should == 2 + i
-      payment_infos[i + 1].kb_payment_id.should == @kb_payment.id
-      payment_infos[i + 1].transaction_type.should == :CAPTURE
-      payment_infos[i + 1].amount.should == partial_capture_amount
-      payment_infos[i + 1].currency.should == @currency
-      payment_infos[i + 1].status.should == :PROCESSED
-      payment_infos[i + 1].gateway_error.should == 'Success'
-      payment_infos[i + 1].gateway_error_code.should be_nil
-      find_value_from_properties(payment_infos[i + 1].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+      payment_infos.size.should == i + 1
+      payment_infos[i].kb_payment_id.should == @kb_payment.id
+      payment_infos[i].transaction_type.should == :CAPTURE
+      payment_infos[i].amount.should == partial_capture_amount
+      payment_infos[i].currency.should == @currency
+      payment_infos[i].status.should == :PROCESSED
+      payment_infos[i].gateway_error.should == 'Success'
+      payment_infos[i].gateway_error_code.should be_nil
+      find_value_from_properties(payment_infos[i].properties, 'payment_processor_account_id').should == @payment_processor_account_id
     end
 
     # Try a partial refund
@@ -145,15 +117,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 6
-    payment_infos[5].kb_payment_id.should == @kb_payment.id
-    payment_infos[5].transaction_type.should == :REFUND
-    payment_infos[5].amount.should == partial_capture_amount
-    payment_infos[5].currency.should == @currency
-    payment_infos[5].status.should == :PROCESSED
-    payment_infos[5].gateway_error.should == 'Success'
-    payment_infos[5].gateway_error_code.should be_nil
-    find_value_from_properties(payment_infos[5].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    payment_infos.size.should == 5
+    payment_infos[4].kb_payment_id.should == @kb_payment.id
+    payment_infos[4].transaction_type.should == :REFUND
+    payment_infos[4].amount.should == partial_capture_amount
+    payment_infos[4].currency.should == @currency
+    payment_infos[4].status.should == :PROCESSED
+    payment_infos[4].gateway_error.should == 'Success'
+    payment_infos[4].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[4].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     # Try to capture again
     payment_response = @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[5].id, @pm.kb_payment_method_id, partial_capture_amount, @currency, @properties, @call_context)
@@ -163,15 +135,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 7
-    payment_infos[6].kb_payment_id.should == @kb_payment.id
-    payment_infos[6].transaction_type.should == :CAPTURE
-    payment_infos[6].amount.should == partial_capture_amount
-    payment_infos[6].currency.should == @currency
-    payment_infos[6].status.should == :PROCESSED
-    payment_infos[6].gateway_error.should == 'Success'
-    payment_infos[6].gateway_error_code.should be_nil
-    find_value_from_properties(payment_infos[6].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    payment_infos.size.should == 6
+    payment_infos[5].kb_payment_id.should == @kb_payment.id
+    payment_infos[5].transaction_type.should == :CAPTURE
+    payment_infos[5].amount.should == partial_capture_amount
+    payment_infos[5].currency.should == @currency
+    payment_infos[5].status.should == :PROCESSED
+    payment_infos[5].gateway_error.should == 'Success'
+    payment_infos[5].gateway_error_code.should be_nil
+    find_value_from_properties(payment_infos[5].properties, 'payment_processor_account_id').should == @payment_processor_account_id
   end
 
   it 'should be able to auth and void' do
@@ -182,28 +154,19 @@ shared_examples 'baid_spec_common' do
     payer_id = find_value_from_properties(payment_response.properties, 'payerId')
     payer_id.should_not be_nil
 
+    validate_details_for(@kb_payment.id, :AUTHORIZE, payer_id)
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 2
-    # details_for
+    payment_infos.size.should == 1
+    # authorize
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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 == :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
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     payment_response = @plugin.void_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @properties, @call_context)
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
@@ -211,35 +174,25 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 3
-    # details_for
+    payment_infos.size.should == 2
+    # authorize
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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
+    find_value_from_properties(payment_infos[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
+    # void
     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].transaction_type.should == :VOID
+    payment_infos[1].amount.should be_nil
+    payment_infos[1].currency.should be_nil
     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].amount.should be_nil
-    payment_infos[2].currency.should be_nil
-    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
 
   it 'should be able to auth, partial capture and void' do
@@ -250,27 +203,18 @@ shared_examples 'baid_spec_common' do
     payer_id = find_value_from_properties(payment_response.properties, 'payerId')
     payer_id.should_not be_nil
 
+    validate_details_for(@kb_payment.id, :AUTHORIZE, payer_id)
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 2
-    # details_for
+    payment_infos.size.should == 1
+    # authorize
     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].amount.should == @amount
+    payment_infos[0].currency.should == @currency
     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 == :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[0].properties, 'payment_processor_account_id').should == @payment_processor_account_id
 
     partial_capture_amount = BigDecimal.new('10')
@@ -281,15 +225,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 3
-    payment_infos[2].kb_payment_id.should == @kb_payment.id
-    payment_infos[2].transaction_type.should == :CAPTURE
-    payment_infos[2].amount.should == partial_capture_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
+    payment_infos.size.should == 2
+    payment_infos[1].kb_payment_id.should == @kb_payment.id
+    payment_infos[1].transaction_type.should == :CAPTURE
+    payment_infos[1].amount.should == partial_capture_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_response = @plugin.void_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[2].id, @pm.kb_payment_method_id, @properties, @call_context)
     payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
@@ -297,15 +241,15 @@ shared_examples 'baid_spec_common' do
 
     # Verify GET API
     payment_infos = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, [], @call_context)
-    payment_infos.size.should == 4
-    payment_infos[3].kb_payment_id.should == @kb_payment.id
-    payment_infos[3].transaction_type.should == :VOID
-    payment_infos[3].amount.should be_nil
-    payment_infos[3].currency.should be_nil
-    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
+    payment_infos.size.should == 3
+    payment_infos[2].kb_payment_id.should == @kb_payment.id
+    payment_infos[2].transaction_type.should == :VOID
+    payment_infos[2].amount.should be_nil
+    payment_infos[2].currency.should be_nil
+    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
 
   it 'should generate forms correctly' do

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 == 5 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * 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 == 5 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * 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 == 5 * n
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 3 * 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 details_for, authorize and void
-    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 3 * n
+    # Each loop triggers one successful authorize and void
+    ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 2 * n
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 9 * n / 2 + 5 * n % 2
   end
 

data/spec/paypal_express/remote/hpp_spec_helpers.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require_relative 'browser_helpers'
 
 module Killbill
@@ -53,28 +54,19 @@ module Killbill
         payer_id = find_value_from_properties(payment_response.properties, 'payerId')
         payer_id.should_not be_nil
 
+        validate_details_for(kb_payment_id, :PURCHASE, payer_id)
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        payment_infos.size.should == 2
-        # details_for
+        payment_infos.size.should == 1
+        # purchase
         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].amount.should == @amount
+        payment_infos[0].currency.should == @currency
         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)
@@ -84,33 +76,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 == 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 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.size.should == 2
+        # refund
+        payment_infos[1].kb_payment_id.should.should == kb_payment_id
+        payment_infos[1].transaction_type.should == :REFUND
         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)
@@ -122,31 +96,22 @@ module Killbill
         payer_id = find_value_from_properties(payment_response.properties, 'payerId')
         payer_id.should_not be_nil
 
+        validate_details_for(kb_payment_id, :AUTHORIZE, payer_id)
         # Verify GET AUTHORIZED PAYMENT
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 2
-        # details_for
+        payment_infos.size.should == 1
+        # authorize
         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].amount.should == @amount
+        payment_infos[0].currency.should == @currency
         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 == :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
+        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
 
         # 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)
@@ -157,36 +122,17 @@ 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 == 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 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.size.should == 2
+        # capture
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].transaction_type.should == :CAPTURE
         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)
@@ -196,44 +142,16 @@ 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 == 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 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 == :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
-        # capture
-        payment_infos[2].kb_payment_id.should == kb_payment_id
-        payment_infos[2].transaction_type.should == :CAPTURE
+        payment_infos.size.should == 3
+        # 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
         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)
@@ -245,26 +163,17 @@ module Killbill
         payer_id = find_value_from_properties(payment_response.properties, 'payerId')
         payer_id.should_not be_nil
 
+        validate_details_for(kb_payment_id, :AUTHORIZE, payer_id)
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 2
-        # details_for
+        payment_infos.size.should == 1
+        # autorize
         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].amount.should == @amount
+        payment_infos[0].currency.should == @currency
         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)
@@ -273,33 +182,15 @@ 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
-        # details_for
-        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 == :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.size.should == 2
+        # capture
         payment_infos[1].kb_payment_id.should == kb_payment_id
-        payment_infos[1].transaction_type.should == :AUTHORIZE
+        payment_infos[1].transaction_type.should == :CAPTURE
         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)
@@ -308,41 +199,15 @@ 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 == 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 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 == :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
+        payment_infos.size.should == 3
         # 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"
+        payment_infos[2].kb_payment_id.should.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].gateway_error_code.should == "10602"
       end
 
       def authorize_and_void(kb_payment_id, payment_external_key, properties, payment_processor_account_id)
@@ -354,28 +219,19 @@ module Killbill
         payer_id = find_value_from_properties(payment_response.properties, 'payerId')
         payer_id.should_not be_nil
 
+        validate_details_for(kb_payment_id, :AUTHORIZE, payer_id)
         # Verify get_payment_info
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties, @call_context)
-        payment_infos.size.should == 2
-        # details_for
+        payment_infos.size.should == 1
+        # authorize
         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].amount.should == @amount
+        payment_infos[0].currency.should == @currency
         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 == :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
+        find_value_from_properties(payment_infos[0].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)
@@ -385,33 +241,14 @@ 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, 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 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.size.should == 2
+        # void
         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].transaction_type.should == :VOID
         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
@@ -444,15 +281,14 @@ module Killbill
 
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
-        # 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
+        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
       end
 
       def failed_purchase(purchase_properties, status, msg, gateway_error_code=nil)
@@ -466,15 +302,14 @@ module Killbill
         # Verify GET API
         payment_infos = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [], @call_context)
         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
+        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
       end
 
       private

data/spec/spec_helper.rb

@@ -22,6 +22,16 @@ ActiveRecord::Base.establish_connection(
 # Create the schema
 require File.expand_path(File.dirname(__FILE__) + '../../db/schema.rb')
 
+
+def validate_details_for(kb_payment_id, transaction_type, payer_id)
+  details_for = ::Killbill::PaypalExpress::PaypalExpressResponse.where(:kb_payment_id => kb_payment_id).where(:api_call => :details_for).last
+  details_for.message.should == "Success"
+  details_for.transaction_type.to_sym.should == transaction_type.to_sym
+  details_for.payer_id.should == payer_id
+  details_for.payer_name.should_not be_nil
+end
+
+
 class PaypalExpressJavaPaymentApi < ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi
 
   def initialize(plugin)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement