kaui 1.0.0 → 1.1.0

data/test/functional/kaui/subscriptions_controller_test.rb

@@ -97,7 +97,7 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
 
     post :update, :id => @bundle.subscriptions.first.subscription_id, :plan_name => 'not-exists'
     assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 400: Could not find any plans named 'not-exists'", flash[:error]
+    assert_equal "Error while communicating with the Kill Bill server: Error 400: Could not find a plan matching spec: (plan: 'not-exists', product: 'undefined', billing period: 'undefined', pricelist 'undefined')", flash[:error]
   end
 
   test 'should update' do

data/test/killbill_test_helper.rb

@@ -163,12 +163,12 @@ module Kaui
       credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :credit_amount => 23.22)
       credit = credit.create(true, user, reason, comment, build_options(tenant, username, password))
 
-      invoice = KillBillClient::Model::Invoice.find_by_id_or_number(credit.invoice_id, true, 'NONE', build_options(tenant, username, password))
+      invoice = KillBillClient::Model::Invoice.find_by_id(credit.invoice_id, true, 'NONE', build_options(tenant, username, password))
       invoice.items.find { |ii| ii.amount == -credit.credit_amount }
     end
 
     def commit_invoice(invoice_id, tenant, username = USERNAME, password = PASSWORD, user = 'Kaui test', reason = nil, comment = nil)
-      invoice = KillBillClient::Model::Invoice.find_by_id_or_number(invoice_id, false, 'NONE', build_options(tenant, username, password))
+      invoice = KillBillClient::Model::Invoice.find_by_id(invoice_id, false, 'NONE', build_options(tenant, username, password))
       invoice.commit(user, reason, comment, build_options(tenant, username, password))
     end
 

data/test/unit/helpers/kaui/uuid_helper_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class Kaui::UuidHelperTest < ActionView::TestCase
+
+  #include Kaui::UuidHelper
+
+  test 'can truncate' do
+    assert_equal '04bdf7b6-...-ab062d33c425', truncate_uuid('04bdf7b6-a95d-4a08-9990-ab062d33c425')
+  end
+
+  test 'can create a popover' do
+    object_id = SecureRandom.uuid
+    expected_markup = %{<span id="#{object_id}-popover" class="object-id-popover" data-id="#{object_id}" data-placement="right">#{truncate_uuid(object_id)}</span}
+    assert_dom_equal expected_markup, object_id_popover(object_id)
+  end
+end

data/test/unit/kaui/admin_tenant_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 class Kaui::AdminTenantTest < ActiveSupport::TestCase
 
+  include Kaui::KillbillTestHelper
+
   PLUGIN_REPO = '[{"plugin_key":"analytics","plugin_name":"killbill-analytics","plugin_type":"java","installed":true},{"plugin_key":"kpm","plugin_name":"killbill-kpm","plugin_type":"ruby","installed":true},{"plugin_key":"paypal-express","plugin_name":"killbill-paypal-express","plugin_type":"ruby","installed":true},
                   {"plugin_key":"killbill-email-notifications","plugin_name":"killbill-email-notifications","plugin_type":null,"installed":true},{"plugin_key":"accertify","plugin_name":"killbill-accertify","plugin_type":"java","installed":false},{"plugin_key":"adyen","plugin_name":"killbill-adyen","plugin_type":"java","installed":false},
                   {"plugin_key":"avatax","plugin_name":"killbill-avatax","plugin_type":"java","installed":false},{"plugin_key":"braintree_blue","plugin_name":"killbill-braintree_blue","plugin_type":"ruby","installed":false},{"plugin_key":"currency","plugin_name":"killbill-currency","plugin_type":"ruby","installed":false},
@@ -72,6 +74,53 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
 
   end
 
+  test 'should fetch proprietary plugin config' do
+    tenant = create_tenant()
+    assert_not_nil(tenant)
+
+    options = build_options(tenant)
+    # upload plugin configuration
+    plugin_name = 'duck-plugin'
+    plugin_config = 'key=value'
+    Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
+
+
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({}, options)
+    assert_not_nil(plugins_config)
+
+    plugin_info = plugins_config.split('::')
+    assert_equal plugin_name, plugin_info[0]
+    assert_equal plugin_config, plugin_info[1].gsub('raw_config=','')
+  end
+
+  test 'should fetch plugin config' do
+    tenant = create_tenant()
+    assert_not_nil(tenant)
+
+    options = build_options(tenant)
+    # upload plugin configuration
+    plugin_key = 'paypal_express'
+    plugin_name = 'killbill-paypal-express'
+    plugin_properties = { 'signature': 'AUmv9J3knY3wGGZoAYL5LM.8OzizApMN7rxHvpXbjb13reJ2CtexMApg',
+                      'login': 'joel-batista-facilitator_api1.live.com',
+                      'password': 'Z93EWSRUYYHYXT3L'
+    }
+
+    plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, 'ruby', plugin_properties)
+    Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
+
+
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({ :paypal_express => { 'type' => 'ruby',
+                                                                  'artifact_id' => 'paypal-express-plugin'} }, options)
+    assert_not_nil(plugins_config)
+    plugin_info = plugins_config.split('::')
+    assert_equal plugin_key, plugin_info[0]
+    response_plugin_properties = plugin_info[1].split('|')
+    assert_equal plugin_properties[:signature], response_plugin_properties[0].split('=')[1]
+    assert_equal plugin_properties[:login], response_plugin_properties[1].split('=')[1]
+    assert_equal plugin_properties[:password], response_plugin_properties[2].split('=')[1]
+  end
+
   private
 
   def plugins_repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -634,6 +634,7 @@ files:
 - app/views/kaui/accounts/_link_parent_modal.html.erb
 - app/views/kaui/accounts/_parent.html.erb
 - app/views/kaui/accounts/_payment_methods.html.erb
+- app/views/kaui/accounts/_personal_info.html.erb
 - app/views/kaui/accounts/edit.html.erb
 - app/views/kaui/accounts/index.html.erb
 - app/views/kaui/accounts/new.html.erb
@@ -682,6 +683,7 @@ files:
 - app/views/kaui/custom_fields/_list_bar.html.erb
 - app/views/kaui/custom_fields/index.html.erb
 - app/views/kaui/custom_fields/new.html.erb
+- app/views/kaui/home/_advanced_search_modal.html.erb
 - app/views/kaui/home/index.html.erb
 - app/views/kaui/invoice_items/_edit_form.html.erb
 - app/views/kaui/invoice_items/edit.html.erb
@@ -843,6 +845,7 @@ files:
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
+- test/unit/helpers/kaui/uuid_helper_test.rb
 - test/unit/kaui/account_email_test.rb
 - test/unit/kaui/account_test.rb
 - test/unit/kaui/admin_tenant_test.rb
@@ -856,7 +859,6 @@ files:
 - test/unit/kaui/payment_test.rb
 - test/unit/kaui/tag_definition_test.rb
 - test/unit/kaui/tenant_test.rb
-- test/unit/kaui/uuid_helper_test.rb
 homepage: http://www.killbill.io
 licenses:
 - Apache License (2.0)
@@ -902,10 +904,10 @@ test_files:
 - test/unit/kaui/date_helper_test.rb
 - test/unit/kaui/tenant_test.rb
 - test/unit/kaui/money_helper_test.rb
-- test/unit/kaui/uuid_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
+- test/unit/helpers/kaui/uuid_helper_test.rb
 - test/test_helper.rb
 - test/integration/kaui/integration_test_helper.rb
 - test/integration/kaui/navigation_test.rb

data/test/unit/kaui/uuid_helper_test.rb

@@ -1,10 +0,0 @@
-require 'test_helper'
-
-class Kaui::UuidHelperTest < ActiveSupport::TestCase
-
-  include Kaui::UuidHelper
-
-  test 'can truncate' do
-    assert_equal '04bdf7b6-...-ab062d33c425', truncate_uuid('04bdf7b6-a95d-4a08-9990-ab062d33c425')
-  end
-end