killbill-paypal-express 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 588915d1b5f301d56b925a8c75f5f643c2725562
-  data.tar.gz: c0025ed6f693a9f726645ca22f368d396457ef07
+  metadata.gz: 5d00219df8659d8d04add7832192638b8cc94388
+  data.tar.gz: ae0902eee81f58d4bc5fe7c3353f9d1bfcb7c628
 SHA512:
-  metadata.gz: 9717c0e506aa81b724132330923b2c4778335482ecce4a7f3c1f3f05387598401ba8ad63a196408a1a393fa7e5a2cf8e6861f0090bdc7f4dfc6255f621871fd3
-  data.tar.gz: 2428403edb96d25c5e373f762e2dd013eb464bd0f6765df1e89b2952984bed239ce3c5062888636fc19fc1a3f6ec6d4e2653964d8d4ac0d9d2045952fb46ee4e
+  metadata.gz: f3e647b46904500a810148b4a631a065efe737f3653a84106cb6330883b794c46ed7398d241fadde9c2ec18a7565371cde185e0fdb236c278fb8e9fafb75f8a1
+  data.tar.gz: 1a4a5610a2fca9f7b1b6fd23daf5a1cc9e96342c3d54c2945aae3f840d2ad0dbcfb6454f43ee6752a7e9aab76c7174c3ccb3473e72d884c4e74f1af05a1c18d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-paypal-express (5.0.3)
+    killbill-paypal-express (5.0.4)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)
@@ -57,7 +57,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
+    builder (3.2.3)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coercible (1.0.0)
@@ -82,20 +82,20 @@ GEM
     jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
     jruby-openssl (0.9.18-java)
-    json (1.8.3-java)
-    killbill (8.3.0)
+    json (1.8.6-java)
+    killbill (8.3.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
     maven-tools (1.1.6)
       virtus (~> 1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.8.1-java)
+    nokogiri (1.7.0.1-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)
@@ -157,4 +157,4 @@ DEPENDENCIES
   selenium-webdriver (~> 2.53.0)
 
 BUNDLED WITH
-   1.11.2
+   1.14.3

data/VERSION

@@ -1 +1 @@
-5.0.3
+5.0.4

data/lib/paypal_express/api.rb

@@ -3,6 +3,7 @@ module Killbill #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
 
       THREE_HOURS_AGO = (3*3600)
+      FIVE_MINUTES_AGO = 300
 
       def initialize
         gateway_builder = Proc.new do |config|
@@ -84,37 +85,32 @@ module Killbill #:nodoc:
       end
 
       def get_payment_info(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"))
+        filtered_plugin_info, plugin_info, with_only_pending_trx = get_raw_payment_info(kb_payment_id, context)
+
+        return filtered_plugin_info if filtered_plugin_info.empty?
+
+        options = properties_to_hash(properties)
+        # We won't be in a state where we have both a pending and unknown plugin infos; so we just return here.
+        if fix_unknown_transactions(kb_payment_id, plugin_info, options, kb_account_id, context) ||
+           cancel_pending_transactions(filtered_plugin_info, with_only_pending_trx)
+          return get_raw_payment_info(kb_payment_id, context)[0]
         end
-        # Should never happen...
-        return [] if t_info_plugins.nil?
 
-        # Completed purchases/authorizations will have two rows in the responses table (one for api_call 'build_form_descriptor', one for api_call 'purchase/authorize')
-        # Other transaction types don't support the :PENDING state
-        target_transaction_types = [:PURCHASE, :AUTHORIZE]
-        only_pending_transaction = t_info_plugins.find { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status != :PENDING }.nil?
-        t_info_plugins_without_pending = t_info_plugins.reject { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status == :PENDING }
+        filtered_plugin_info
+      end
 
-        # If its token has expired, cancel the payment and update the response row.
-        if only_pending_transaction
-          return t_info_plugins unless token_expired(t_info_plugins.last)
-          begin
-            cancel_pending_transaction(t_info_plugins.last).nil?
-            logger.info("Cancel pending kb_payment_id='#{t_info_plugins.last.kb_payment_id}', kb_payment_transaction_id='#{t_info_plugins.last.kb_transaction_payment_id}'")
-            super(kb_account_id, kb_payment_id, properties, context)
-          rescue => e
-            logger.warn("Unexpected exception while canceling pending kb_payment_id='#{t_info_plugins.last.kb_payment_id}', kb_payment_transaction_id='#{t_info_plugins.last.kb_transaction_payment_id}': #{e.message}\n#{e.backtrace.join("\n")}")
-            t_info_plugins
-          end
-        else
-          t_info_plugins_without_pending
+      def cancel_pending_transactions(t_info_plugins, only_pending_trx)
+        return false unless only_pending_trx && token_expired(t_info_plugins.last)
+
+        begin
+          cancel_pending_transaction(t_info_plugins.last).nil?
+          logger.info("Cancel pending kb_payment_id='#{t_info_plugins.last.kb_payment_id}', kb_payment_transaction_id='#{t_info_plugins.last.kb_transaction_payment_id}'")
+          return true
+        rescue => e
+          logger.warn("Unexpected exception while canceling pending kb_payment_id='#{t_info_plugins.last.kb_payment_id}', kb_payment_transaction_id='#{t_info_plugins.last.kb_transaction_payment_id}': #{e.message}\n#{e.backtrace.join("\n")}")
         end
+
+        false
       end
 
       def search_payments(search_key, offset, limit, properties, context)
@@ -558,6 +554,78 @@ module Killbill #:nodoc:
         end
         sub_hash.empty? ? nil : sub_hash
       end
+
+      def fix_unknown_transactions(payment_id, trx_plugin_info, options, kb_account_id, context)
+        unknown_transactions_info = trx_plugin_info.find_all { |t_info_plugin| t_info_plugin.status == :UNDEFINED }
+        now = Time.parse(@clock.get_clock.get_utc_now.to_s)
+
+        token = trx_plugin_info.map {|plugin_info| find_value_from_properties(plugin_info.properties, 'authorization')}.find {|token| !token.blank?}
+        if token.nil?
+          logger.warn("Unable to fix UNDEFINED kb_payment_id='#{payment_id}'. Unable to find its token.")
+          return false
+        end
+
+        need_refresh = false
+        payment_processor_account_id = find_payment_processor_id_from_initial_call(kb_account_id, context.tenant_id, token) || :default
+        unknown_transactions_info.each do |unknown_trx_info|
+          delay_since_transaction = now - unknown_trx_info.created_date
+          delay_since_transaction = 0 if delay_since_transaction < 0
+
+          # Do nothing before the delayed checking time
+          janitor_delay_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :janitor_delay_threshold) || FIVE_MINUTES_AGO).to_i
+          next unless delay_since_transaction >= janitor_delay_threshold
+
+          paypal_response_id = find_value_from_properties(unknown_trx_info.properties, 'paypalExpressResponseId')
+          if paypal_response_id.nil?
+            logger.warn("Unable to fix UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}' (paypal_response_id not specified)")
+            next
+          end
+          response = PaypalExpressResponse.find_by(:id => paypal_response_id)
+
+          fixed = false
+          begin
+            gateway  = lookup_gateway(payment_processor_account_id, context.tenant_id)
+            fixed    = @private_api.fix_unknown_transaction(response, unknown_trx_info, gateway, kb_account_id, context.tenant_id)
+            logger.info("Unable to fix UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}' (not found in PayPal)") unless fixed
+          rescue => e
+            logger.warn("Unable to fix UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}': #{e.message}\n#{e.backtrace.join("\n")}")
+          end
+
+          if !fixed
+            # hard expiration limit
+            janitor_cancellation_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || THREE_HOURS_AGO).to_i
+            if delay_since_transaction >= janitor_cancellation_threshold
+              response.transition_to_plugin_failure
+              logger.info("Expire UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}' to CANCELED")
+              need_refresh = true
+            end
+          else
+            need_refresh = true
+          end
+        end
+
+        need_refresh
+      end
+
+      def get_raw_payment_info(kb_payment_id, 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
+
+        # Completed purchases/authorizations will have two rows in the responses table (one for api_call 'build_form_descriptor', one for api_call 'purchase/authorize')
+        # Other transaction types don't support the :PENDING state
+        target_transaction_types = [:PURCHASE, :AUTHORIZE]
+        with_only_pending_trx = t_info_plugins.find { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status != :PENDING }.nil?
+
+        # Filter out the pending transaction if there is already a response tied with the same transaction but indicating a final state
+        t_info_plugins_without_pending = t_info_plugins.reject { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status == :PENDING }
+        [with_only_pending_trx ? t_info_plugins : t_info_plugins_without_pending, t_info_plugins, with_only_pending_trx]
+      end
     end
   end
 end

data/lib/paypal_express/models/response.rb

@@ -146,6 +146,72 @@ module Killbill #:nodoc:
 
         t_info_plugin
       end
+
+      def transition_to_plugin_failure
+        transition_to_failure
+      end
+
+      def transition_to_payment_failure(transaction_id)
+        transition_to_failure false, {:authorization => transaction_id}
+      end
+
+      def transition_to_failure(is_plugin_failure = true, params = {})
+        begin
+          error_details = JSON.parse(message)
+          original_message = nil
+        rescue
+          error_details = {}
+          original_message = message
+        end
+        error_details['original_message'] = original_message unless original_message.blank?
+        error_details['payment_plugin_status'] = is_plugin_failure ? 'CANCELED' : 'ERROR'
+
+        updated_attributes = {
+            :message => error_details.to_json,
+            :success => false,
+            :updated_at => Time.now.utc
+        }.merge!(params)
+
+        # Update the response row
+        update!(updated_attributes)
+      end
+
+      def transition_to_success(transaction_id, trx_plugin_info)
+        begin
+          new_message = JSON.parse(message)
+          original_message = nil
+        rescue
+          new_message = {}
+          original_message = message
+        end
+        new_message['original_message'] = original_message unless original_message.blank?
+        new_message['payment_plugin_status'] = 'PROCESSED'
+        new_message['janitor'] = 'Janitor transitioned the response to success'
+
+        updated_attributes = {
+            :message => new_message.to_json,
+            :authorization => transaction_id,
+            :success => true,
+            :updated_at => Time.now.utc
+        }
+
+        # Update the response row
+        update!(updated_attributes)
+
+        # Create the transaction row if needed (cannot have been created before or the state wouldn't have been UNDEFINED)
+        build_paypal_express_transaction(:kb_account_id => kb_account_id,
+                                         :kb_tenant_id => kb_tenant_id,
+                                         :amount_in_cents => trx_plugin_info.amount,
+                                         :currency => trx_plugin_info.currency,
+                                         :api_call => api_call,
+                                         :kb_payment_id => kb_payment_id,
+                                         :kb_payment_transaction_id => kb_payment_transaction_id,
+                                         :transaction_type => transaction_type,
+                                         :payment_processor_account_id => payment_processor_account_id,
+                                         :txn_id => txn_id,
+                                         :created_at => updated_at,
+                                         :updated_at => updated_at).save!
+      end
     end
   end
 end

data/lib/paypal_express/private_api.rb

@@ -1,6 +1,12 @@
 module Killbill #:nodoc:
   module PaypalExpress #:nodoc:
     class PrivatePaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PrivatePaymentPlugin
+
+      ONE_HOUR_AGO = 3600
+      STATUS = {:CAPTURE   => {:success_status => 'Completed', :type => 'Payment'},
+                :AUTHORIZE => {:success_status => 'Pending',   :type => 'Authorization'},
+                :REFUND    => {:success_status => 'Completed', :type => 'Refund'}}
+
       def initialize(session = {})
         super(:paypal_express,
               ::Killbill::PaypalExpress::PaypalExpressPaymentMethod,
@@ -42,6 +48,30 @@ module Killbill #:nodoc:
         context = kb_apis.create_context(kb_tenant_id)
         kb_account_ids.map {|id| kb_apis.account_user_api.get_account_by_id(id, context).external_key }
       end
+
+      def fix_unknown_transaction(plugin_response, trx_plugin_info, gateway, kb_account_id, kb_tenant_id)
+        status, transaction_id, type = search_transaction(trx_plugin_info.created_date - ONE_HOUR_AGO,
+                                                          trx_plugin_info.amount,
+                                                          trx_plugin_info.currency,
+                                                          gateway,
+                                                          trx_plugin_info.kb_transaction_payment_id)
+        return false if status.blank? || transaction_id.blank? || type.blank?
+
+        if type == STATUS[trx_plugin_info.transaction_type][:type] &&
+           status == STATUS[trx_plugin_info.transaction_type][:success_status]
+          plugin_response.transition_to_success transaction_id, trx_plugin_info
+          logger.info("Fixed UNDEFINED kb_transaction_id='#{trx_plugin_info.kb_transaction_payment_id}' to PROCESSED")
+          return true
+        end
+
+        false
+      end
+
+      def search_transaction(start_time, amount, currency, gateway, kb_payment_transaction_id)
+        options = {:start_date => start_time, :invoice_id => kb_payment_transaction_id, :amount => amount, :currency => currency}
+        response = gateway.transaction_search options
+        [response.params['status'], response.authorization, response.params['type']]
+      end
     end
   end
 end

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.3</version>
+    <version>5.0.4</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/hpp_spec.rb

@@ -13,6 +13,11 @@ shared_examples 'hpp_spec_common' do
     @plugin.kb_apis.proxied_services[:payment_api].delete_all_payments
   end
 
+  it 'should return an empty list of plugin info if payment does not exist' do
+    payment_plugin_info = @plugin.get_payment_info(@pm.kb_account_id, SecureRandom.uuid, [], @call_context)
+    payment_plugin_info.size.should == 0
+  end
+
   it 'should generate forms correctly' do
     ::Killbill::PaypalExpress::PaypalExpressTransaction.count.should == 0
     ::Killbill::PaypalExpress::PaypalExpressResponse.count.should == 0
@@ -369,6 +374,105 @@ shared_examples 'hpp_spec_common' do
     payment_infos[0].gateway_error.should == 'Token expired. Payment Canceled by Janitor.'
     payment_infos[0].gateway_error_code.should be_nil
   end
+
+  it 'should fix the unknown transactions to success' do
+    [:AUTHORIZE, :CAPTURE, :REFUND].each do |type|
+      payment_external_key = SecureRandom.uuid
+      properties = @plugin.hash_to_properties(
+          :transaction_external_key => payment_external_key,
+          :create_pending_payment => true,
+          :payment_processor_account_id => @payment_processor_account_id,
+          :auth_mode => true
+      )
+      form = @plugin.build_form_descriptor(@pm.kb_account_id, @form_fields, properties, @call_context)
+      kb_payment_id = validate_form_property(form, 'kb_payment_id')
+      kb_trx_id = validate_form_property(form, 'kb_transaction_id')
+      validate_token(form)
+
+      @plugin.authorize_payment(@pm.kb_account_id, kb_payment_id, kb_trx_id, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      nb_plugin_info = 1
+      if type == :AUTHORIZE
+        verify_janitor_transition nb_plugin_info, type, :PROCESSED, kb_payment_id
+        # Be able to capture
+        payment_response = @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
+        payment_response.amount.should == @amount
+        payment_response.transaction_type.should == :CAPTURE
+      elsif type == :CAPTURE
+        nb_plugin_info = 2
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        verify_janitor_transition nb_plugin_info, type, :PROCESSED, kb_payment_id
+        # Be able to refund
+        payment_response = @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        payment_response.status.should eq(:PROCESSED), payment_response.gateway_error
+        payment_response.amount.should == @amount
+        payment_response.transaction_type.should == :REFUND
+      elsif type == :REFUND
+        nb_plugin_info = 3
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        verify_janitor_transition nb_plugin_info, type, :PROCESSED, kb_payment_id
+      end
+    end
+  end
+
+  it 'should fix the unknown transactions to plugin failure' do
+    [:AUTHORIZE, :CAPTURE, :REFUND].each do |type|
+      payment_external_key = SecureRandom.uuid
+      properties = @plugin.hash_to_properties(
+          :transaction_external_key => payment_external_key,
+          :create_pending_payment => true,
+          :payment_processor_account_id => @payment_processor_account_id,
+          :auth_mode => true
+      )
+      form = @plugin.build_form_descriptor(@pm.kb_account_id, @form_fields, properties, @call_context)
+      kb_payment_id = validate_form_property(form, 'kb_payment_id')
+      kb_trx_id = validate_form_property(form, 'kb_transaction_id')
+      validate_token(form)
+
+      properties = @plugin.hash_to_properties({:skip_gw => true})
+      @plugin.authorize_payment(@pm.kb_account_id, kb_payment_id, kb_trx_id, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      nb_plugin_info = 1
+      if type == :CAPTURE
+        nb_plugin_info = 2
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      elsif type == :REFUND
+        nb_plugin_info = 3
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      end
+      verify_janitor_transition nb_plugin_info, type, :CANCELED, kb_payment_id
+    end
+  end
+
+  it 'should remain in unknown if cancellation period is not reached' do
+    [:AUTHORIZE, :CAPTURE, :REFUND].each do |type|
+      payment_external_key = SecureRandom.uuid
+      properties = @plugin.hash_to_properties(
+          :transaction_external_key => payment_external_key,
+          :create_pending_payment => true,
+          :payment_processor_account_id => @payment_processor_account_id,
+          :auth_mode => true
+      )
+      form = @plugin.build_form_descriptor(@pm.kb_account_id, @form_fields, properties, @call_context)
+      kb_payment_id = validate_form_property(form, 'kb_payment_id')
+      kb_trx_id = validate_form_property(form, 'kb_transaction_id')
+      validate_token(form)
+
+      properties = @plugin.hash_to_properties({:skip_gw => true})
+      @plugin.authorize_payment(@pm.kb_account_id, kb_payment_id, kb_trx_id, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      nb_plugin_info = 1
+      if type == :CAPTURE
+        nb_plugin_info = 2
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      elsif type == :REFUND
+        nb_plugin_info = 3
+        @plugin.capture_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+        @plugin.refund_payment(@pm.kb_account_id, kb_payment_id, SecureRandom.uuid, @pm.kb_payment_method_id, @amount, @currency, properties, @call_context)
+      end
+      verify_janitor_transition nb_plugin_info, type, :UNDEFINED, kb_payment_id, true, 3600*3
+    end
+  end
 end
 
 describe Killbill::PaypalExpress::PaymentPlugin do

data/spec/paypal_express/remote/hpp_spec_helpers.rb

@@ -312,6 +312,41 @@ module Killbill
         payment_infos[0].gateway_error_code.should == gateway_error_code
       end
 
+      def transition_last_response_to_UNDEFINED(expected_nb_transactions, kb_payment_id, delete_last_trx = true)
+        Killbill::PaypalExpress::PaypalExpressTransaction.last.delete if delete_last_trx
+        response = Killbill::PaypalExpress::PaypalExpressResponse.last
+        initial_auth = response.authorization
+        response.update(:authorization => nil, :message => {:payment_plugin_status => 'UNDEFINED'}.to_json)
+
+        skip_gw = Killbill::Plugin::Model::PluginProperty.new
+        skip_gw.key = 'skip_gw'
+        skip_gw.value = 'true'
+        properties_with_skip_gw = [skip_gw]
+
+        # Set skip_gw=true, to avoid calling the report API
+        transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, properties_with_skip_gw, @call_context)
+        transaction_info_plugins.size.should == expected_nb_transactions
+        transaction_info_plugins.last.status.should eq(:UNDEFINED)
+
+        [response, initial_auth]
+      end
+
+      def verify_janitor_transition(nb_trx_plugin_info, trx_type, trx_status, kb_payment_id, delete_last_trx = true, hard_expiration_date = 0, janitor_delay = 0)
+        transition_last_response_to_UNDEFINED(nb_trx_plugin_info, kb_payment_id, delete_last_trx)
+        # wait 5 sec for PayPal to populate the record in search endpoint
+        sleep 5
+        janitor_delay_threshold = Killbill::Plugin::Model::PluginProperty.new
+        janitor_delay_threshold.key = 'janitor_delay_threshold'
+        janitor_delay_threshold.value = janitor_delay
+        cancel_threshold = Killbill::Plugin::Model::PluginProperty.new
+        cancel_threshold.key = 'cancel_threshold'
+        cancel_threshold.value = hard_expiration_date
+        transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, kb_payment_id, [janitor_delay_threshold, cancel_threshold], @call_context)
+        transaction_info_plugins.size.should == nb_trx_plugin_info
+        transaction_info_plugins.last.status.should eq(trx_status)
+        transaction_info_plugins.last.transaction_type.should eq(trx_type)
+      end
+
       private
 
       def verify_payment_method(kb_account_id = nil)

metadata

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