mas-rad_core 0.0.60 → 0.0.61

data/spec/factories/firm.rb

@@ -20,13 +20,13 @@ FactoryGirl.define do
     ongoing_advice_fee_structures { create_list(:ongoing_advice_fee_structure, rand(1..3)) }
     allowed_payment_methods { create_list(:allowed_payment_method, rand(1..3)) }
     investment_sizes { create_list(:investment_size, rand(5..10)) }
-    retirement_income_products_percent 15
-    pension_transfer_percent 15
-    long_term_care_percent 15
-    equity_release_percent 15
-    inheritance_tax_and_estate_planning_percent 15
-    wills_and_probate_percent 15
-    other_percent 10
+    retirement_income_products_flag true
+    pension_transfer_flag true
+    long_term_care_flag true
+    equity_release_flag true
+    inheritance_tax_and_estate_planning_flag true
+    wills_and_probate_flag true
+    other_flag true
     latitude { Faker::Address.latitude.to_f.round(6) }
     longitude { Faker::Address.longitude.to_f.round(6) }
 
@@ -37,13 +37,13 @@ FactoryGirl.define do
     end
 
     factory :firm_with_no_business_split do
-      retirement_income_products_percent 0
-      pension_transfer_percent 0
-      long_term_care_percent 0
-      equity_release_percent 0
-      inheritance_tax_and_estate_planning_percent 0
-      wills_and_probate_percent 0
-      other_percent 0
+      retirement_income_products_flag false
+      pension_transfer_flag false
+      long_term_care_flag false
+      equity_release_flag false
+      inheritance_tax_and_estate_planning_flag false
+      wills_and_probate_flag false
+      other_flag false
     end
 
     factory :firm_with_advisers do

data/spec/models/firm_spec.rb

@@ -191,16 +191,6 @@ RSpec.describe Firm do
       end
     end
 
-    describe 'business income breakdown' do
-      context 'when sum not equal to 100' do
-        before do
-          firm.retirement_income_products_percent = 5
-        end
-
-        it { is_expected.not_to be_valid }
-      end
-    end
-
     describe 'investment size' do
       context 'when none assigned' do
         before { firm.investment_sizes = [] }

data/spec/serializers/firm_serializer_spec.rb

@@ -59,27 +59,27 @@ RSpec.describe FirmSerializer do
     end
 
     it 'exposes `retirement_income_products`' do
-      expect(subject[:retirement_income_products]).to eq(firm.retirement_income_products_percent)
+      expect(subject[:retirement_income_products]).to eq(firm.retirement_income_products_flag ? 100 : 0)
     end
 
     it 'exposes `pension_transfer`' do
-      expect(subject[:pension_transfer]).to eq(firm.pension_transfer_percent)
+      expect(subject[:pension_transfer]).to eq(firm.pension_transfer_flag ? 100 : 0)
     end
 
     it 'exposes `options_when_paying_for_care`' do
-      expect(subject[:options_when_paying_for_care]).to eq(firm.long_term_care_percent)
+      expect(subject[:options_when_paying_for_care]).to eq(firm.long_term_care_flag ? 100 : 0)
     end
 
     it 'exposes `equity_release`' do
-      expect(subject[:equity_release]).to eq(firm.equity_release_percent)
+      expect(subject[:equity_release]).to eq(firm.equity_release_flag ? 100 : 0)
     end
 
     it 'exposes `inheritance_tax_planning`' do
-      expect(subject[:inheritance_tax_planning]).to eq(firm.inheritance_tax_and_estate_planning_percent)
+      expect(subject[:inheritance_tax_planning]).to eq(firm.inheritance_tax_and_estate_planning_flag ? 100 : 0)
     end
 
     it 'exposes `wills_and_probate`' do
-      expect(subject[:wills_and_probate]).to eq(firm.wills_and_probate_percent)
+      expect(subject[:wills_and_probate]).to eq(firm.wills_and_probate_flag ? 100 : 0)
     end
 
     it 'exposes `other_advice_method_ids`' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -281,6 +281,7 @@ files:
 - db/migrate/20150228095315_add_cy_name_to_other_advice_methods.rb
 - db/migrate/20150305150719_add_cy_name_to_investment_size.rb
 - db/migrate/20150423154732_add_index_on_lookup_advisers_reference_number.rb
+- db/migrate/20150630143001_change_percentage_fields_to_boolean_fields_on_firm.rb
 - lib/mas/elastic_search_client.rb
 - lib/mas/firm_repository.rb
 - lib/mas/firm_result.rb