mas-rad_core 0.0.53 → 0.0.54

data/spec/factories/firm.rb

@@ -30,8 +30,10 @@ FactoryGirl.define do
     latitude { Faker::Address.latitude.to_f.round(6) }
     longitude { Faker::Address.longitude.to_f.round(6) }
 
-    factory :subsidiary do
+    factory :trading_name do
       parent factory: Firm
+
+      factory :subsidiary
     end
 
     factory :firm_with_no_business_split do
@@ -48,8 +50,10 @@ FactoryGirl.define do
       advisers { create_list(:adviser, 3) }
     end
 
-    factory :firm_with_subsidiaries do
-      subsidiaries { create_list(:subsidiary, 3, fca_number: fca_number) }
+    factory :firm_with_trading_names do
+      subsidiaries { create_list(:trading_name, 3, fca_number: fca_number) }
+
+      factory :firm_with_subsidiaries
     end
 
     factory :firm_with_principal do

data/spec/models/firm_spec.rb

@@ -284,7 +284,7 @@ RSpec.describe Firm do
     end
 
     context 'when the firm has subsidiaries' do
-      let(:firm) { create(:firm_with_subsidiaries) }
+      let(:firm) { create(:firm_with_trading_names) }
 
       it 'cascades destroy to subsidiaries' do
         subsidiary = firm.subsidiaries.first
@@ -297,11 +297,11 @@ RSpec.describe Firm do
     context 'when the firm has a principal' do
       let(:firm) { create(:firm_with_principal) }
 
-      it 'cascades destroy to principal' do
+      it 'does not destroy the principal' do
         principal = firm.principal
         firm.destroy
         firm.run_callbacks(:commit)
-        expect(Principal.where(token: principal.id)).to be_empty
+        expect(Principal.where(token: principal.id)).not_to be_empty
       end
     end
 

data/spec/models/principal_spec.rb

@@ -204,4 +204,12 @@ RSpec.describe Principal do
       expect(principal.field_order).to contain_exactly(*fields)
     end
   end
+
+  describe '#destroy' do
+    it 'cascades to the firm' do
+      firm = principal.firm
+      principal.destroy
+      expect(Firm.where(id: firm.id)).to be_empty
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails