killbill 3.2.4 → 4.0.0

data/spec/killbill/helpers/configuration_spec.rb

@@ -2,16 +2,22 @@ require 'spec_helper'
 
 describe Killbill::Plugin::ActiveMerchant do
 
-  before(:all) do
-    @logger       = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-
-    @call_context           = Killbill::Plugin::Model::CallContext.new
-    @call_context.tenant_id = '00001011-a022-b033-0055-aa0000000066'
-    @call_context           = @call_context.to_ruby(@call_context)
+  let(:logger) do
+    logger       = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
+  end
 
+  let(:call_context) do
+    call_context           = Killbill::Plugin::Model::CallContext.new
+    call_context.tenant_id = '00001011-a022-b033-0055-aa0000000066'
+    call_context.to_ruby(call_context)
   end
 
+  it 'supports deployments without global configuration' do
+    do_initialize_with_config_path!('')
+    do_initialize_with_config_path!(nil)
+  end
 
   it 'should support multi-tenancy configurations' do
     do_initialize!(<<-eos)
@@ -22,7 +28,7 @@ describe Killbill::Plugin::ActiveMerchant do
 
     do_common_checks
 
-    gw = ::Killbill::Plugin::ActiveMerchant.gateways(@call_context.tenant_id)
+    gw = ::Killbill::Plugin::ActiveMerchant.gateways(call_context.tenant_id)
     gw.size.should == 1
     gw[:default][:login].should == 'admin2'
     gw[:default][:password].should == 'password2'
@@ -105,6 +111,64 @@ describe Killbill::Plugin::ActiveMerchant do
     gw[:default][:password].should == 'password_1'
   end
 
+  it 'should honor ActiveMerchant configuration options' do
+    do_initialize!
+    do_common_checks
+    verify_active_merchant_config
+
+    do_initialize!(<<-eos)
+  :retry_safe: true
+  :open_timeout: 12
+  :ssl_version: 5
+  :ssl_strict: false
+    eos
+    do_common_checks
+    verify_active_merchant_config(:retry_safe => true, :open_timeout => 12, :ssl_version => 5, :ssl_strict => false)
+  end
+
+  it 'overrides ActiveMerchant urls' do
+    # Verify we don't override the defaults
+    do_initialize!
+    ::ActiveMerchant::Billing::WorldpayGateway.test_url.should == 'https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp'
+    ::ActiveMerchant::Billing::WorldpayGateway.live_url.should == 'https://secure.worldpay.com/jsp/merchant/xml/paymentService.jsp'
+
+    # Override both the test and live urls
+    do_initialize!({:test_url => 'https://test.killbill.io', :live_url => 'https://live.killbill.io'},
+                   database_config,
+                   Proc.new { ::ActiveMerchant::Billing::WorldpayGateway.new :login => 'login', :password => 'password' })
+
+    gw = ::Killbill::Plugin::ActiveMerchant.gateways
+    gw.size.should == 1
+    # Verify the attributes have been updated on both the gateway instance and on the class (implementations may use both)
+    gw[:default].test_url.should == 'https://test.killbill.io'
+    gw[:default].live_url.should == 'https://live.killbill.io'
+    ::ActiveMerchant::Billing::WorldpayGateway.test_url.should == 'https://test.killbill.io'
+    ::ActiveMerchant::Billing::WorldpayGateway.live_url.should == 'https://live.killbill.io'
+  end
+
+  it 'sets up false pool with jndi database configuration' do
+    db_config = { :adapter => 'mysql2', :jndi => 'jdbc/MyDB', :pool => false }
+
+    ActiveRecord::Base.should_receive(:establish_connection).with(db_config).once
+    do_initialize!({ :test => true }, db_config)
+
+    pool_class = ActiveRecord::Base.connection_handler.connection_pool_class
+    expect( pool_class ).to be ActiveRecord::Bogacs::FalsePool
+  end
+
+  it 'interprets the config file through ERB' do
+    value = '<%= 12 %>'
+    do_initialize!({ :key => value })
+    ::Killbill::Plugin::ActiveMerchant.config[:test][:key].should == 12
+  end
+
+  after do
+    if ::ActiveRecord::ConnectionAdapters::ConnectionHandler.respond_to?(:connection_pool_class=)
+      pool_class = ::ActiveRecord::ConnectionAdapters::ConnectionPool # restore if Bogacs loaded
+      ::ActiveRecord::ConnectionAdapters::ConnectionHandler.connection_pool_class = pool_class
+    end
+  end
+
   private
 
   def do_common_checks
@@ -112,40 +176,60 @@ describe Killbill::Plugin::ActiveMerchant do
     ::Killbill::Plugin::ActiveMerchant.currency_conversions.should be_nil
     ::Killbill::Plugin::ActiveMerchant.initialized.should be_true
     ::Killbill::Plugin::ActiveMerchant.kb_apis.should_not be_nil
-    ::Killbill::Plugin::ActiveMerchant.logger.should == @logger
+    ::Killbill::Plugin::ActiveMerchant.logger.should == logger
+  end
+
+  def verify_active_merchant_config(config = {})
+    ::ActiveMerchant::Billing::Gateway.open_timeout.should == (config.has_key?(:open_timeout) ? config[:open_timeout] : 60)
+    ::ActiveMerchant::Billing::Gateway.read_timeout.should == (config.has_key?(:read_timeout) ? config[:read_timeout] : 60)
+    ::ActiveMerchant::Billing::Gateway.retry_safe.should == (config.has_key?(:retry_safe) ? config[:retry_safe] : false)
+    ::ActiveMerchant::Billing::Gateway.ssl_strict.should == (config.has_key?(:ssl_strict) ? config[:ssl_strict] : true)
+    ::ActiveMerchant::Billing::Gateway.ssl_version.should == (config.has_key?(:ssl_version) ? config[:ssl_version] : nil)
+    ::ActiveMerchant::Billing::Gateway.max_retries.should == (config.has_key?(:max_retries) ? config[:max_retries] : 3)
+    ::ActiveMerchant::Billing::Gateway.proxy_address.should == (config.has_key?(:proxy_address) ? config[:proxy_address] : nil)
+    ::ActiveMerchant::Billing::Gateway.proxy_port.should == (config.has_key?(:proxy_port) ? config[:proxy_port] : nil)
   end
 
-  def do_initialize!(extra_config='')
+  def do_initialize!(extra_config = '', db_config = database_config, gw_builder = Proc.new { |config| config })
+    extra_config_yaml = ''; db_config_yaml = ''
+
+    [[extra_config, extra_config_yaml],
+     [db_config, db_config_yaml]].each do |config, config_yaml|
+      if config.is_a?(String)
+        config_yaml.replace(config)
+      else
+        config.to_yaml.sub("---\n", '').each_line { |line| config_yaml << "  #{line}" } # indent
+      end
+    end
+
     Dir.mktmpdir do |dir|
-      file = File.new(File.join(dir, 'test.yml'), 'w+')
-      file.write(<<-eos)
-:test:
-#{extra_config}
-# As defined by spec_helper.rb
-:database:
-  :adapter: 'sqlite3'
-  :database: 'test.db'
-      eos
-      file.close
+      File.open(path = File.join(dir, 'test.yml'), 'w+') do |file|
+        file.write(":test:\n#{extra_config_yaml}:database:\n#{db_config_yaml}")
+        file.close
+        do_initialize_with_config_path!(file.path, gw_builder)
+      end
+    end
+  end
+
+  def do_initialize_with_config_path!(path = nil, gw_builder = Proc.new { |config| config })
+    ::Killbill::Plugin::ActiveMerchant.initialize!(gw_builder,
+                                                   :test,
+                                                   logger,
+                                                   :KEY,
+                                                   path,
+                                                   ::Killbill::Plugin::KillbillApi.new('test', svcs_with_per_tenant_config))
+  end
 
-      per_tenant_config =<<-oes
+  def svcs_with_per_tenant_config
+    per_tenant_config =<<-oes
 :test:
   :login: admin2
   :password: password2
 :database:
   :adapter: 'sqlite3'
   :database: 'test.db'
-      oes
-
-      @tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({@call_context.tenant_id => per_tenant_config})
-    svcs = {:tenant_user_api => @tenant_api}
-
-     ::Killbill::Plugin::ActiveMerchant.initialize! Proc.new { |config| config },
-                                                   :test,
-                                                   @logger,
-                                                   :KEY,
-                                                   file.path,
-                                                   ::Killbill::Plugin::KillbillApi.new('test', svcs)
-    end
+    oes
+    @tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({call_context.tenant_id => per_tenant_config})
+    {:tenant_user_api => @tenant_api}
   end
 end

data/spec/killbill/helpers/payment_method_spec.rb

@@ -1,15 +1,5 @@
 require 'spec_helper'
 
-module Killbill #:nodoc:
-  module Test #:nodoc:
-    class TestPaymentMethod < ::Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod
-
-      self.table_name = 'test_payment_methods'
-
-    end
-  end
-end
-
 describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
   before :each do
@@ -176,7 +166,12 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
                                                     :city                 => 'city',
                                                     :state                => 'state',
                                                     :zip                  => 'zip',
-                                                    :country              => 'country'
+                                                    :country              => 'country',
+                                                    :created_at           => Time.now.utc,
+                                                    :updated_at           => Time.now.utc
+
+    pm.created_at.should_not be_nil
+    pm.updated_at.should_not be_nil
 
     pm = ::Killbill::Test::TestPaymentMethod.from_kb_payment_method_id(pm.kb_payment_method_id, pm.kb_tenant_id)
     pm.cc_exp_month.should == '07'
@@ -187,21 +182,21 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = '1234') OR \"test_payment_methods\".\"cc_exp_year\" = '1234') OR \"test_payment_methods\".\"cc_last_4\" = '1234') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE ((((((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = '1234' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = '1234') OR #{q('test_payment_methods')}.#{q('token')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_type')} = '1234') OR #{q('test_payment_methods')}.#{q('state')} = '1234') OR #{q('test_payment_methods')}.#{q('zip')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_exp_month')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_exp_year')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_last_4')} = '1234') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')}"
     # Note that Kill Bill will pass a String, even for numeric types
     ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query numeric)
-    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = '1234') OR \"test_payment_methods\".\"cc_exp_year\" = '1234') OR \"test_payment_methods\".\"cc_last_4\" = '1234') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
+    expected_query = "SELECT  DISTINCT #{q('test_payment_methods')}.* FROM #{q('test_payment_methods')}  WHERE ((((((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = '1234' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = '1234') OR #{q('test_payment_methods')}.#{q('token')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_type')} = '1234') OR #{q('test_payment_methods')}.#{q('state')} = '1234') OR #{q('test_payment_methods')}.#{q('zip')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%1234%') OR #{q('test_payment_methods')}.#{q('cc_exp_month')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_exp_year')} = '1234') OR #{q('test_payment_methods')}.#{q('cc_last_4')} = '1234') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')} LIMIT 10 OFFSET 0"
     # Note that Kill Bill will pass a String, even for numeric types
     ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
     # Check count query (search query string)
-    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
+    expected_query = "SELECT COUNT(DISTINCT #{q('test_payment_methods')}.#{q('id')}) FROM #{q('test_payment_methods')}  WHERE (((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = 'XXX' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = 'XXX') OR #{q('test_payment_methods')}.#{q('token')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_type')} = 'XXX') OR #{q('test_payment_methods')}.#{q('state')} = 'XXX') OR #{q('test_payment_methods')}.#{q('zip')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%XXX%') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')}"
     ::Killbill::Test::TestPaymentMethod.search_query('XXX', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query string)
-    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
+    expected_query = "SELECT  DISTINCT #{q('test_payment_methods')}.* FROM #{q('test_payment_methods')}  WHERE (((((((((((#{q('test_payment_methods')}.#{q('kb_account_id')} = 'XXX' OR #{q('test_payment_methods')}.#{q('kb_payment_method_id')} = 'XXX') OR #{q('test_payment_methods')}.#{q('token')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_type')} = 'XXX') OR #{q('test_payment_methods')}.#{q('state')} = 'XXX') OR #{q('test_payment_methods')}.#{q('zip')} = 'XXX') OR #{q('test_payment_methods')}.#{q('cc_first_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('cc_last_name')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address1')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('address2')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('city')} LIKE '%XXX%') OR #{q('test_payment_methods')}.#{q('country')} LIKE '%XXX%') AND #{q('test_payment_methods')}.#{q('kb_tenant_id')} = '11-22-33'  ORDER BY #{q('test_payment_methods')}.#{q('id')} LIMIT 10 OFFSET 0"
     ::Killbill::Test::TestPaymentMethod.search_query('XXX', '11-22-33', 0, 10).to_sql.should == expected_query
   end
 
@@ -222,7 +217,9 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
                                                     :city                 => 'city',
                                                     :state                => 'state',
                                                     :zip                  => 'zip',
-                                                    :country              => 'country'
+                                                    :country              => 'country',
+                                                    :created_at           => Time.now.utc,
+                                                    :updated_at           => Time.now.utc
 
     do_search('foo').size.should == 0
     do_search('ccType').size.should == 1
@@ -247,7 +244,9 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
                                                      :city                 => 'city',
                                                      :state                => 'state',
                                                      :zip                  => 'zip',
-                                                     :country              => 'country'
+                                                     :country              => 'country',
+                                                     :created_at           => Time.now.utc,
+                                                     :updated_at           => Time.now.utc
 
     do_search('foo').size.should == 0
     do_search('ccType').size.should == 2
@@ -283,4 +282,8 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
     pmip.payment_method_id.should == kb_payment_method_id
     pmip.external_payment_method_id.should == external_payment_method_id
   end
+
+  def q(arg)
+    ::ActiveRecord::Base.connection.quote_column_name(arg)
+  end
 end

data/spec/killbill/helpers/payment_plugin_spec.rb

@@ -1,227 +1,408 @@
 require 'spec_helper'
-require 'spec/killbill/helpers/payment_method_spec'
-require 'spec/killbill/helpers/response_spec'
-require 'spec/killbill/helpers/transaction_spec'
 
 describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
   include Killbill::Plugin::ActiveMerchant::RSpec
 
-  before(:all) do
-    Dir.mktmpdir do |dir|
-      file = File.new(File.join(dir, 'test.yml'), "w+")
-      file.write(<<-eos)
-:test:
-  - :account_id: default
-    :test: true
-  - :account_id: something_non_standard
-    :test: true
-# As defined by spec_helper.rb
-:database:
-  :adapter: 'sqlite3'
-  :database: 'test.db'
-      eos
-      file.close
-
-      @plugin              = ::Killbill::Plugin::ActiveMerchant::PaymentPlugin.new(Proc.new { |config| nil },
-                                                                                   :test,
-                                                                                   ::Killbill::Test::TestPaymentMethod,
-                                                                                   ::Killbill::Test::TestTransaction,
-                                                                                   ::Killbill::Test::TestResponse)
-      @payment_api         = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
-      @tenant_api = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({})
-
-      @plugin.kb_apis      = ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => @payment_api, :tenant_user_api => @tenant_api})
-      @plugin.logger       = Logger.new(STDOUT)
-      @plugin.logger.level = Logger::INFO
-      @plugin.conf_dir     = File.dirname(file)
-      @plugin.root         = File.dirname(file)
-
-      # Start the plugin here - since the config file will be deleted
-      @plugin.start_plugin
-    end
+  let(:payment_api) { ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new }
+  let(:tenant_api) { ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new }
+  let(:kb_apis) { ::Killbill::Plugin::KillbillApi.new('test', {:payment_api => payment_api, :tenant_user_api => tenant_api}) }
+  let(:logger) do
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
   end
 
   before(:each) do
-    @kb_account_id        = SecureRandom.uuid
-    @kb_payment_id        = SecureRandom.uuid
+    @kb_account_id = SecureRandom.uuid
+    @kb_payment_id = SecureRandom.uuid
     @kb_payment_method_id = SecureRandom.uuid
 
-    @amount_in_cents        = rand(100000)
-    @currency               = 'USD'
-    @call_context           = Killbill::Plugin::Model::CallContext.new
+    @amount_in_cents = rand(100000)
+    @currency = 'USD'
+    @call_context = Killbill::Plugin::Model::CallContext.new
     @call_context.tenant_id = SecureRandom.uuid
 
-    property       = ::Killbill::Plugin::Model::PluginProperty.new
-    property.key   = 'skip_gw'
-    property.value = 'true'
-    @properties    = [property]
-
-    @ppai                 = ::Killbill::Plugin::Model::PluginProperty.new
-    @ppai.key             = 'payment_processor_account_id'
-    @ppai.value           = 'something_non_standard'
-    @properties_with_ppai = @properties.dup
-    @properties_with_ppai << @ppai
-
-    token                            = ::Killbill::Plugin::Model::PluginProperty.new
-    token.key                        = 'token'
-    token.value                      = SecureRandom.uuid
-    @payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+    token = ::Killbill::Plugin::Model::PluginProperty.new
+    token.key = 'token'
+    token.value = SecureRandom.uuid
+    @payment_method_props = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
     @payment_method_props.properties = [token]
   end
 
-  after(:all) do
-    @plugin.stop_plugin
-  end
+  context 'when skipping the gateway' do
+    let(:plugin) do
+      plugin = ::Killbill::Plugin::ActiveMerchant::PaymentPlugin.new(Proc.new { |config| nil },
+                                                                     :test,
+                                                                     ::Killbill::Test::TestPaymentMethod,
+                                                                     ::Killbill::Test::TestTransaction,
+                                                                     ::Killbill::Test::TestResponse)
+      plugin.kb_apis = kb_apis
+      plugin.logger = logger
+
+      plugin_config = {
+          :test => [
+              {:account_id => 'default', :test => true},
+              {:account_id => 'something_non_standard', :test => true}
+          ]
+      }
+      with_plugin_yaml_config('test.yml', plugin_config) do |file|
+        plugin.conf_dir = File.dirname(file)
+        plugin.root = File.dirname(file)
+
+        # Start the plugin here - since the config file will be deleted
+        plugin.start_plugin
+      end
+
+      plugin
+    end
 
-  it 'should implement payment plugin API calls' do
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
-
-    @plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context)
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 1
-    ::Killbill::Test::TestPaymentMethod.where(:kb_payment_method_id => @kb_payment_method_id).first.token.should == @payment_method_props.properties[0].value
-
-    authorization_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, authorization_id, SecureRandom.uuid, :AUTHORIZE)
-    authorization = @plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(authorization, authorization_id, :AUTHORIZE, 1)
-
-    capture_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, capture_id, SecureRandom.uuid, :CAPTURE)
-    capture = @plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2)
-
-    purchase_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, purchase_id, SecureRandom.uuid, :PURCHASE)
-    purchase = @plugin.purchase_payment(@kb_account_id, @kb_payment_id, purchase_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(purchase, purchase_id, :PURCHASE, 3)
-
-    void_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, void_id, SecureRandom.uuid, :VOID)
-    void = @plugin.void_payment(@kb_account_id, @kb_payment_id, void_id, @kb_payment_method_id, @properties, @call_context)
-    verify_transaction_info_plugin(void, void_id, :VOID, 4)
-
-    credit_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, credit_id, SecureRandom.uuid, :CREDIT)
-    credit = @plugin.credit_payment(@kb_account_id, @kb_payment_id, credit_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(credit, credit_id, :CREDIT, 5)
-
-    refund_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, refund_id, SecureRandom.uuid, :REFUND)
-    refund = @plugin.refund_payment(@kb_account_id, @kb_payment_id, refund_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(refund, refund_id, :REFUND, 6)
-
-    @plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id, @properties, @call_context)
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
-  end
+    before(:each) do
+      property = ::Killbill::Plugin::Model::PluginProperty.new
+      property.key = 'skip_gw'
+      property.value = 'true'
+      @properties = [property]
+
+      @ppai = ::Killbill::Plugin::Model::PluginProperty.new
+      @ppai.key = 'payment_processor_account_id'
+      @ppai.value = 'something_non_standard'
+      @properties_with_ppai = @properties.dup
+      @properties_with_ppai << @ppai
+    end
+
+    after(:all) do
+      plugin.stop_plugin
+    end
 
-  it 'should support different payment_processor_account_ids' do
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+    it 'should implement payment plugin API calls' do
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context)
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 1
+      ::Killbill::Test::TestPaymentMethod.where(:kb_payment_method_id => @kb_payment_method_id).first.token.should == @payment_method_props.properties[0].value
+
+      authorization_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, authorization_id, SecureRandom.uuid, :AUTHORIZE)
+      authorization = plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(authorization, authorization_id, :AUTHORIZE, 1)
+
+      capture_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, capture_id, SecureRandom.uuid, :CAPTURE)
+      capture = plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2)
+
+      purchase_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, purchase_id, SecureRandom.uuid, :PURCHASE)
+      purchase = plugin.purchase_payment(@kb_account_id, @kb_payment_id, purchase_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(purchase, purchase_id, :PURCHASE, 3)
+
+      void_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, void_id, SecureRandom.uuid, :VOID)
+      void = plugin.void_payment(@kb_account_id, @kb_payment_id, void_id, @kb_payment_method_id, @properties, @call_context)
+      verify_transaction_info_plugin(void, void_id, :VOID, 4)
+
+      credit_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, credit_id, SecureRandom.uuid, :CREDIT)
+      credit = plugin.credit_payment(@kb_account_id, @kb_payment_id, credit_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(credit, credit_id, :CREDIT, 5)
+
+      refund_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, refund_id, SecureRandom.uuid, :REFUND)
+      refund = plugin.refund_payment(@kb_account_id, @kb_payment_id, refund_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(refund, refund_id, :REFUND, 6)
+
+      plugin.delete_payment_method(@kb_account_id, @kb_payment_method_id, @properties, @call_context)
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+    end
 
-    @plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context)
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 1
-    ::Killbill::Test::TestPaymentMethod.where(:kb_payment_method_id => @kb_payment_method_id).first.token.should == @payment_method_props.properties[0].value
+    it 'should support different payment_processor_account_ids' do
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
 
-    authorization_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, authorization_id, SecureRandom.uuid, :AUTHORIZE)
-    authorization = @plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties_with_ppai, @call_context)
-    verify_transaction_info_plugin(authorization, authorization_id, :AUTHORIZE, 1, @ppai.value)
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, @properties, @call_context)
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 1
+      ::Killbill::Test::TestPaymentMethod.where(:kb_payment_method_id => @kb_payment_method_id).first.token.should == @payment_method_props.properties[0].value
 
-    capture_id = SecureRandom.uuid
-    @payment_api.add_payment(@kb_payment_id, capture_id, SecureRandom.uuid, :CAPTURE)
-    # We omit the payment_processor_account_id to verify we can retrieve it
-    capture = @plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
-    verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2, @ppai.value)
-  end
+      authorization_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, authorization_id, SecureRandom.uuid, :AUTHORIZE)
+      authorization = plugin.authorize_payment(@kb_account_id, @kb_payment_id, authorization_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties_with_ppai, @call_context)
+      verify_transaction_info_plugin(authorization, authorization_id, :AUTHORIZE, 1, @ppai.value)
 
-  it 'should support storing a credit card' do
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
-
-    properties = []
-    properties << create_pm_kv_info('ccNumber', '41111111111111111')
-    properties << create_pm_kv_info('ccFirstName', 'Paul')
-    properties << create_pm_kv_info('ccLastName', 'Dupond')
-    properties << create_pm_kv_info('ccType', 'VISA')
-    properties << create_pm_kv_info('ccExpirationMonth', '12')
-    properties << create_pm_kv_info('ccExpirationYear', '17')
-    payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
-    payment_method_props.properties = properties
-    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
-
-    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
-    pms.size.should == 1
-    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
-    @plugin.find_value_from_properties(pm.properties, 'token').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should == 'Paul'
-    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should == 'Dupond'
-    @plugin.find_value_from_properties(pm.properties, 'ccType').should == 'visa'
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should == '12'
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should == '17'
-    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should == '1111'
-    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should == '41111111111111111'
-
-    # Verify we can retrieve the payment source, during the payment call
-    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
-    source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
-    source.first_name.should == 'Paul'
-    source.last_name.should == 'Dupond'
-    source.brand.should == 'visa'
-    source.month.should == 12
-    source.year.should == 17
-    source.number.should == '41111111111111111'
-  end
+      capture_id = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id, capture_id, SecureRandom.uuid, :CAPTURE)
+      # We omit the payment_processor_account_id to verify we can retrieve it
+      capture = plugin.capture_payment(@kb_account_id, @kb_payment_id, capture_id, @kb_payment_method_id, @amount_in_cents, @currency, @properties, @call_context)
+      verify_transaction_info_plugin(capture, capture_id, :CAPTURE, 2, @ppai.value)
+    end
 
-  it 'should support storing a token' do
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
-
-    properties = []
-    properties << create_pm_kv_info('token', 'ABCDEF')
-    payment_method_props            = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
-    payment_method_props.properties = properties
-    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
-
-    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
-    pms.size.should == 1
-    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
-    @plugin.find_value_from_properties(pm.properties, 'token').should == 'ABCDEF'
-    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
-
-    # Verify we can retrieve the payment source, during the payment call
-    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
-    source.should == 'ABCDEF'
+    it 'should support storing a credit card' do
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+      properties = []
+      properties << build_property('ccNumber', '41111111111111111')
+      properties << build_property('ccFirstName', 'Paul')
+      properties << build_property('ccLastName', 'Dupond')
+      properties << build_property('ccType', 'visa')
+      properties << build_property('ccExpirationMonth', '12')
+      properties << build_property('ccExpirationYear', '17')
+      payment_method_props = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+      payment_method_props.properties = properties
+      plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
+
+      pms = plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+      pms.size.should == 1
+      pm = plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+      plugin.find_value_from_properties(pm.properties, 'token').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccFirstName').should == 'Paul'
+      plugin.find_value_from_properties(pm.properties, 'ccLastName').should == 'Dupond'
+      plugin.find_value_from_properties(pm.properties, 'ccType').should == 'visa'
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should == '12'
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should == '17'
+      plugin.find_value_from_properties(pm.properties, 'ccLast4').should == '1111'
+      plugin.find_value_from_properties(pm.properties, 'ccNumber').should == '41111111111111111'
+
+      # Verify we can retrieve the payment source, during the payment call
+      source = plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+      source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
+      source.first_name.should == 'Paul'
+      source.last_name.should == 'Dupond'
+      source.brand.should == 'visa'
+      source.month.should == 12
+      source.year.should == 17
+      source.number.should == '41111111111111111'
+    end
+
+    it 'should support storing a token' do
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+      properties = []
+      properties << build_property('token', 'ABCDEF')
+      payment_method_props = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+      payment_method_props.properties = properties
+      plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, payment_method_props, true, @properties, @call_context)
+
+      pms = plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+      pms.size.should == 1
+      pm = plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+      plugin.find_value_from_properties(pm.properties, 'token').should == 'ABCDEF'
+      plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
+
+      # Verify we can retrieve the payment source, during the payment call
+      source = plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+      source.should == 'ABCDEF'
+    end
+
+    it 'should support storing a placeholder row' do
+      plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
+
+      plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, ::Killbill::Plugin::Model::PaymentMethodPlugin.new, true, @properties, @call_context)
+
+      pms = plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
+      pms.size.should == 1
+      pm = plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
+      plugin.find_value_from_properties(pm.properties, 'token').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
+      plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
+
+      # Verify we can retrieve the payment source, during the payment call
+      source = plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
+      source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
+      source.first_name.should be_nil
+      source.last_name.should be_nil
+      source.brand.should be_nil
+      source.month.should be_nil
+      source.year.should be_nil
+      source.number.should be_nil
+    end
+
+    it 'recognizes a tokenized card by the network' do
+      options = {
+          :cc_number => '4242424242424242',
+          :cc_type => 'visa',
+          :cc_expiration_month => 12,
+          :cc_expiration_year => 2019,
+          :payment_cryptogram => 'EHuWW9PiBkWvqE5juRwDzAUFBAk=',
+          :eci => '05'
+      }
+      source = plugin.get_payment_source(nil, [], options, @call_context)
+      source.is_a?(::ActiveMerchant::Billing::NetworkTokenizationCreditCard).should be_true
+      source.type.should == 'network_tokenization'
+      source.number.should == '4242424242424242'
+      source.brand.should == 'visa'
+      source.month.should == 12
+      source.year.should == 2019
+      source.payment_cryptogram.should == 'EHuWW9PiBkWvqE5juRwDzAUFBAk='
+      source.eci.should == '05'
+    end
+
+    it 'recognizes an ApplePay token' do
+      options = {
+          :token => '{"data":"BDPNWStMmGewQUWGg4o7E/j+1cq1T78qyU84b67itjcYI8wPYAOhshjhZPrqdUr4XwPMbj4zcGMdy++1H2VkPOY+BOMF25ub19cX4nCvkXUUOTjDllB1TgSr8JHZxgp9rCgsSUgbBgKf60XKutXf6aj/o8ZIbKnrKQ8Sh0ouLAKloUMn+vPu4+A7WKrqrauz9JvOQp6vhIq+HKjUcUNCITPyFhmOEtq+H+w0vRa1CE6WhFBNnCHqzzWKckB/0nqLZRTYbF0p+vyBiVaWHeghERfHxRtbzpeczRPPuFsfpHVs48oPLC/k/1MNd47kz/pHDcR/Dy6aUM+lNfoily/QJN+tS3m0HfOtISAPqOmXemvr6xJCjCZlCuw0C9mXz/obHpofuIES8r9cqGGsUAPDpw7g642m4PzwKF+HBuYUneWDBNSD2u6jbAG3","version":"EC_v1","header":{"applicationData":"94ee059335e587e501cc4bf90613e0814f00a7b08bc7c648fd865a2af6a22cc2","transactionId":"c1caf5ae72f0039a82bad92b828363734f85bf2f9cadf193d1bad9ddcb60a795","ephemeralPublicKey":"MIIBSzCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAABAAAAAAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA///////////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMVAMSdNgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg9KE5RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8AAAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBA0IABGm+gsl0PZFT/kDdUSkxwyfo8JpwTQQzBm9lJJnmTl4DGUvAD4GseGj/pshBZ0K3TeuqDt/tDLbE+8/m0yCmoxw=","publicKeyHash":"/bb9CNC36uBheHFPbmohB7Oo1OsX2J+kJqv48zOVViQ="},"signature":"MIIDQgYJKoZIhvcNAQcCoIIDMzCCAy8CAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCAiswggInMIIBlKADAgECAhBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIdBQAwJzElMCMGA1UEAx4cAGMAaABtAGEAaQBAAHYAaQBzAGEALgBjAG8AbTAeFw0xNDAxMDEwNjAwMDBaFw0yNDAxMDEwNjAwMDBaMCcxJTAjBgNVBAMeHABjAGgAbQBhAGkAQAB2AGkAcwBhAC4AYwBvAG0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANC8+kgtgmvWF1OzjgDNrjTEBRuo/5MKvlM146pAf7Gx41blE9w4fIXJAD7FfO7QKjIXYNt39rLyy7xDwb/5IkZM60TZ2iI1pj55Uc8fd4fzOpk3ftZaQGXNLYptG1d9V7IS82Oup9MMo1BPVrXTPHNcsM99EPUnPqdbeGc87m0rAgMBAAGjXDBaMFgGA1UdAQRRME+AEHZWPrWtJd7YZ431hCg7YFShKTAnMSUwIwYDVQQDHhwAYwBoAG0AYQBpAEAAdgBpAHMAYQAuAGMAbwBtghBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIdBQADgYEAbUKYCkuIKS9QQ2mFcMYREIm2l+Xg8/JXv+GBVQJkOKoscY4iNDFA/bQlogf9LLU84THwNRnsvV3Prv7RTY81gq0dtC8zYcAaAkCHII3yqMnJ4AOu6EOW9kJk232gSE7WlCtHbfLSKfuSgQX8KXQYuZLk2Rr63N8ApXsXwBL3cJ0xgeAwgd0CAQEwOzAnMSUwIwYDVQQDHhwAYwBoAG0AYQBpAEAAdgBpAHMAYQAuAGMAbwBtAhBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIaBQAwDQYJKoZIhvcNAQEBBQAEgYBaK3ElOstbH8WooseDABf+Jg/129JcIawm7c6Vxn7ZasNbAq3tAt8Pty+uQCgssXqZkLA7kz2GzMolNtv9wYmu9Ujwar1PHYS+B/oGnoz591wjagXWRz0nMo5y3O1KzX0d8CRHAVa88SrV1a5JIiRev3oStIqwv5xuZldag6Tr8w=="}',
+          :payment_instrument_name => 'SomeBank Points Card',
+          :payment_network => 'MasterCard',
+          :transaction_identifier => 'uniqueidentifier123'
+      }
+      source = plugin.get_payment_source(nil, [], options, @call_context)
+      source.is_a?(::ActiveMerchant::Billing::ApplePayPaymentToken).should be_true
+      source.type.should == 'apple_pay'
+      source.payment_instrument_name.should == 'SomeBank Points Card'
+      source.payment_network.should == 'MasterCard'
+      # Not set in ApplePayPaymentToken?
+      #source.transaction_identifier.should == 'uniqueidentifier123'
+      source.payment_data.should == {
+          'data' => 'BDPNWStMmGewQUWGg4o7E/j+1cq1T78qyU84b67itjcYI8wPYAOhshjhZPrqdUr4XwPMbj4zcGMdy++1H2VkPOY+BOMF25ub19cX4nCvkXUUOTjDllB1TgSr8JHZxgp9rCgsSUgbBgKf60XKutXf6aj/o8ZIbKnrKQ8Sh0ouLAKloUMn+vPu4+A7WKrqrauz9JvOQp6vhIq+HKjUcUNCITPyFhmOEtq+H+w0vRa1CE6WhFBNnCHqzzWKckB/0nqLZRTYbF0p+vyBiVaWHeghERfHxRtbzpeczRPPuFsfpHVs48oPLC/k/1MNd47kz/pHDcR/Dy6aUM+lNfoily/QJN+tS3m0HfOtISAPqOmXemvr6xJCjCZlCuw0C9mXz/obHpofuIES8r9cqGGsUAPDpw7g642m4PzwKF+HBuYUneWDBNSD2u6jbAG3',
+          'version' => 'EC_v1',
+          'header' => {
+              'applicationData' => '94ee059335e587e501cc4bf90613e0814f00a7b08bc7c648fd865a2af6a22cc2',
+              'transactionId' => 'c1caf5ae72f0039a82bad92b828363734f85bf2f9cadf193d1bad9ddcb60a795',
+              'ephemeralPublicKey' => 'MIIBSzCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAABAAAAAAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA///////////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMVAMSdNgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg9KE5RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8AAAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBA0IABGm+gsl0PZFT/kDdUSkxwyfo8JpwTQQzBm9lJJnmTl4DGUvAD4GseGj/pshBZ0K3TeuqDt/tDLbE+8/m0yCmoxw=',
+              'publicKeyHash' => '/bb9CNC36uBheHFPbmohB7Oo1OsX2J+kJqv48zOVViQ='
+          },
+          'signature' => 'MIIDQgYJKoZIhvcNAQcCoIIDMzCCAy8CAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCAiswggInMIIBlKADAgECAhBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIdBQAwJzElMCMGA1UEAx4cAGMAaABtAGEAaQBAAHYAaQBzAGEALgBjAG8AbTAeFw0xNDAxMDEwNjAwMDBaFw0yNDAxMDEwNjAwMDBaMCcxJTAjBgNVBAMeHABjAGgAbQBhAGkAQAB2AGkAcwBhAC4AYwBvAG0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANC8+kgtgmvWF1OzjgDNrjTEBRuo/5MKvlM146pAf7Gx41blE9w4fIXJAD7FfO7QKjIXYNt39rLyy7xDwb/5IkZM60TZ2iI1pj55Uc8fd4fzOpk3ftZaQGXNLYptG1d9V7IS82Oup9MMo1BPVrXTPHNcsM99EPUnPqdbeGc87m0rAgMBAAGjXDBaMFgGA1UdAQRRME+AEHZWPrWtJd7YZ431hCg7YFShKTAnMSUwIwYDVQQDHhwAYwBoAG0AYQBpAEAAdgBpAHMAYQAuAGMAbwBtghBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIdBQADgYEAbUKYCkuIKS9QQ2mFcMYREIm2l+Xg8/JXv+GBVQJkOKoscY4iNDFA/bQlogf9LLU84THwNRnsvV3Prv7RTY81gq0dtC8zYcAaAkCHII3yqMnJ4AOu6EOW9kJk232gSE7WlCtHbfLSKfuSgQX8KXQYuZLk2Rr63N8ApXsXwBL3cJ0xgeAwgd0CAQEwOzAnMSUwIwYDVQQDHhwAYwBoAG0AYQBpAEAAdgBpAHMAYQAuAGMAbwBtAhBcl+Pf3+U4pk13nVD9nwQQMAkGBSsOAwIaBQAwDQYJKoZIhvcNAQEBBQAEgYBaK3ElOstbH8WooseDABf+Jg/129JcIawm7c6Vxn7ZasNbAq3tAt8Pty+uQCgssXqZkLA7kz2GzMolNtv9wYmu9Ujwar1PHYS+B/oGnoz591wjagXWRz0nMo5y3O1KzX0d8CRHAVa88SrV1a5JIiRev3oStIqwv5xuZldag6Tr8w=='
+      }
+    end
+
+    # Apple Pay integration with CyberSource for example
+    it 'merges tokenized cards with payment method information' do
+      # Create a payment method with just a first and last name
+      cc_first_name = ::Killbill::Plugin::Model::PluginProperty.new
+      cc_first_name.key = 'cc_first_name'
+      cc_first_name.value = 'John'
+      cc_last_name = ::Killbill::Plugin::Model::PluginProperty.new
+      cc_last_name.key = 'cc_last_name'
+      cc_last_name.value = 'Doe'
+      skip_gw = ::Killbill::Plugin::Model::PluginProperty.new
+      skip_gw.key = 'skip_gw'
+      skip_gw.value = 'true'
+      pm_properties = ::Killbill::Plugin::Model::PaymentMethodPlugin.new
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, pm_properties, true, [skip_gw, cc_first_name, cc_last_name], @call_context)
+
+      # Build the NetworkTokenizationCreditCard
+      options = {
+          :cc_number => '4242424242424242',
+          :cc_type => 'visa',
+          :cc_expiration_month => 12,
+          :cc_expiration_year => 2019,
+          :payment_cryptogram => 'EHuWW9PiBkWvqE5juRwDzAUFBAk=',
+          :eci => '05'
+      }
+      source = plugin.get_payment_source(@kb_payment_method_id, [], options, @call_context)
+      source.is_a?(::ActiveMerchant::Billing::NetworkTokenizationCreditCard).should be_true
+      source.type.should == 'network_tokenization'
+      source.number.should == '4242424242424242'
+      source.brand.should == 'visa'
+      source.month.should == 12
+      source.year.should == 2019
+      source.payment_cryptogram.should == 'EHuWW9PiBkWvqE5juRwDzAUFBAk='
+      source.eci.should == '05'
+      # The first and last name should have been populated from the payment method
+      source.first_name.should == 'John'
+      source.last_name.should == 'Doe'
+    end
   end
 
-  it 'should support storing a placeholder row' do
-    @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context).size.should == 0
-
-    @plugin.add_payment_method(@kb_account_id, SecureRandom.uuid, ::Killbill::Plugin::Model::PaymentMethodPlugin.new, true, @properties, @call_context)
-
-    pms = @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context)
-    pms.size.should == 1
-    pm = @plugin.get_payment_method_detail(@kb_account_id, pms[0].payment_method_id, @properties, @call_context)
-    @plugin.find_value_from_properties(pm.properties, 'token').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccFirstName').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccLastName').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccType').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationMonth').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccExpirationYear').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccLast4').should be_nil
-    @plugin.find_value_from_properties(pm.properties, 'ccNumber').should be_nil
-
-    # Verify we can retrieve the payment source, during the payment call
-    source = @plugin.get_payment_source(pm.kb_payment_method_id, [], {}, @call_context)
-    source.is_a?(::ActiveMerchant::Billing::CreditCard).should be_true
-    source.first_name.should be_nil
-    source.last_name.should be_nil
-    source.brand.should be_nil
-    source.month.should be_nil
-    source.year.should be_nil
-    source.number.should be_nil
+  context 'with a dummy gateway' do
+    let(:gateway) { DummyRecordingGateway.new }
+
+    let(:plugin) do
+      plugin = ::Killbill::Plugin::ActiveMerchant::PaymentPlugin.new(Proc.new { |config| gateway },
+                                                                     :test,
+                                                                     ::Killbill::Test::TestPaymentMethod,
+                                                                     ::Killbill::Test::TestTransaction,
+                                                                     ::Killbill::Test::TestResponse)
+      plugin.kb_apis = kb_apis
+      plugin.logger = logger
+
+      plugin_config = {
+          :test => [
+              {:account_id => 'default', :test => true},
+          ]
+      }
+      with_plugin_yaml_config('test.yml', plugin_config) do |file|
+        plugin.conf_dir = File.dirname(file)
+        plugin.root = File.dirname(file)
+
+        # Start the plugin here - since the config file will be deleted
+        plugin.start_plugin
+      end
+
+      plugin
+    end
+
+    after(:each) do
+      gateway.call_stack.clear
+    end
+
+    after(:all) do
+      plugin.stop_plugin
+    end
+
+    it 'sets the kb_payment_transaction_id as order_id by default' do
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, [], @call_context)
+
+      kb_payment_transaction_id = SecureRandom.uuid
+      plugin.purchase_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, [], @call_context)
+
+      sent_options = gateway.call_stack[-1][:options]
+      sent_options.size.should == 11
+      sent_options[:currency].should == @currency
+      sent_options[:description].should == "Kill Bill purchase for #{kb_payment_transaction_id}"
+      sent_options[:order_id].should == kb_payment_transaction_id
+    end
+
+    it 'sets the kb_payment_transaction_id as order_id if specified' do
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, [], @call_context)
+
+      property = ::Killbill::Plugin::Model::PluginProperty.new
+      property.key = 'external_key_as_order_id'
+      property.value = 'false'
+
+      kb_payment_transaction_id = SecureRandom.uuid
+      plugin.purchase_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, [property], @call_context)
+
+      sent_options = gateway.call_stack[-1][:options]
+      sent_options.size.should == 12
+      sent_options[:currency].should == @currency
+      sent_options[:description].should == "Kill Bill purchase for #{kb_payment_transaction_id}"
+      sent_options[:order_id].should == kb_payment_transaction_id
+    end
+
+    it 'sets the payment transaction external key as order_id if specified' do
+      plugin.add_payment_method(@kb_account_id, @kb_payment_method_id, @payment_method_props, true, [], @call_context)
+
+      property = ::Killbill::Plugin::Model::PluginProperty.new
+      property.key = 'external_key_as_order_id'
+      property.value = 'true'
+
+      kb_payment_transaction_id = SecureRandom.uuid
+      kb_payment_transaction_external_key = SecureRandom.uuid
+      payment_api.add_payment(@kb_payment_id,  kb_payment_transaction_id, kb_payment_transaction_external_key, :PURCHASE)
+      plugin.purchase_payment(@kb_account_id, @kb_payment_id, kb_payment_transaction_id, @kb_payment_method_id, @amount_in_cents, @currency, [property], @call_context)
+
+      sent_options = gateway.call_stack[-1][:options]
+      sent_options.size.should == 12
+      sent_options[:currency].should == @currency
+      sent_options[:description].should == "Kill Bill purchase for #{kb_payment_transaction_id}"
+      sent_options[:order_id].should == kb_payment_transaction_external_key
+    end
+
+    it 'closes the connection after each request' do
+      ::ActiveRecord::Base.retrieve_connection
+      ::ActiveRecord::Base.connection_pool.active_connection?.should == true
+
+      plugin.after_request
+
+      ::ActiveRecord::Base.connection_pool.active_connection?.should == false
+    end
   end
 
   private
@@ -242,8 +423,27 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
     # Verify we routed to the right gateway
     (t_info_plugin.properties.find { |kv| kv.key.to_s == 'payment_processor_account_id' }).value.to_s.should == payment_processor_account_id
 
-    transactions = @plugin.get_payment_info(@kb_account_id, @kb_payment_id, [], @call_context)
+    transactions = plugin.get_payment_info(@kb_account_id, @kb_payment_id, [], @call_context)
     transactions.size.should == transaction_nb
     transactions[transaction_nb - 1].to_json.should == t_info_plugin.to_json
   end
+
+  class DummyRecordingGateway < ::ActiveMerchant::Billing::Gateway
+
+    attr_reader :call_stack
+
+    def initialize
+      @call_stack = []
+    end
+
+    def purchase(money, paysource, options = {})
+      @call_stack << {:money => money, :source => paysource, :options => options}
+      ::ActiveMerchant::Billing::Response.new(true, 'Success!', {:authorized_amount => money}, :test => true, :authorization => 12345)
+    end
+
+    def store(paysource, options = {})
+      @call_stack << {:source => paysource, :options => options}
+      ::ActiveMerchant::Billing::Response.new(true, 'Success!', {:billingid => '1'}, :test => true, :authorization => 12345)
+    end
+  end
 end