mas-rad_core 0.0.95 → 0.0.96

data/spec/factories/adviser.rb

@@ -13,6 +13,7 @@ FactoryGirl.define do
     latitude  { Faker::Address.latitude.to_f.round(6) }
     longitude { Faker::Address.longitude.to_f.round(6) }
     firm factory: :firm_without_advisers
+    bypass_reference_number_check false
 
     after(:build) do |a, evaluator|
       if a.reference_number? && evaluator.create_linked_lookup_advisor

data/spec/models/adviser_spec.rb

@@ -1,10 +1,4 @@
 RSpec.describe Adviser do
-  include QueueSpecHelper
-
-  before do
-    clear_job_queue
-  end
-
   describe 'before validation' do
     context 'when a reference number is present' do
       let(:attributes) { attributes_for(:adviser) }
@@ -17,10 +11,24 @@ RSpec.describe Adviser do
         )
       end
 
-      it 'assigns #name from the lookup Adviser data' do
-        adviser.validate
+      context 'when a name is not present' do
+        before do
+          adviser.name = nil
+        end
+
+        it 'assigns #name from the lookup Adviser data' do
+          adviser.validate
+
+          expect(adviser.name).to eq('Mr. Welp')
+        end
+      end
+
+      context 'when a name is present' do
+        it 'does not override the existing name' do
+          adviser.validate
 
-        expect(adviser.name).to eq('Mr. Welp')
+          expect(adviser.name).not_to eq('Mr. Welp')
+        end
       end
     end
   end
@@ -57,39 +65,47 @@ RSpec.describe Adviser do
     end
 
     describe 'reference number' do
-      it 'is required' do
-        expect(build(:adviser, reference_number: nil)).to_not be_valid
+      context 'when `bypass_reference_number_check` is true' do
+        it 'is not required' do
+          expect(build(:adviser, bypass_reference_number_check: true, reference_number: nil)).to be_valid
+        end
       end
 
-      it 'must be three characters and five digits exactly' do
-        %w(badtimes ABCDEFGH 8008135! 12345678).each do |bad|
-          Lookup::Adviser.create!(reference_number: bad, name: 'Mr. Derp')
-
-          expect(build(:adviser,
-                       reference_number: bad,
-                       create_linked_lookup_advisor: false)).to_not be_valid
+      context 'when `bypass_reference_number_check` is false' do
+        it 'is required' do
+          expect(build(:adviser, reference_number: nil)).to_not be_valid
         end
-      end
 
-      it 'must be matched to the lookup data' do
-        build(:adviser, reference_number: 'ABC12345').tap do |a|
-          Lookup::Adviser.delete_all
+        it 'must be three characters and five digits exactly' do
+          %w(badtimes ABCDEFGH 8008135! 12345678).each do |bad|
+            Lookup::Adviser.create!(reference_number: bad, name: 'Mr. Derp')
 
-          expect(a).to_not be_valid
+            expect(build(:adviser,
+                         reference_number: bad,
+                         create_linked_lookup_advisor: false)).to_not be_valid
+          end
         end
-      end
 
-      context 'when an adviser with the same reference number already exists' do
-        let(:reference_number) { 'ABC12345' }
+        it 'must be matched to the lookup data' do
+          build(:adviser, reference_number: 'ABC12345').tap do |a|
+            Lookup::Adviser.delete_all
 
-        before do
-          create(:adviser, reference_number: reference_number)
+            expect(a).to_not be_valid
+          end
         end
 
-        it 'must not be valid' do
-          expect(build(:adviser,
-                       reference_number: reference_number,
-                       create_linked_lookup_advisor: false)).to_not be_valid
+        context 'when an adviser with the same reference number already exists' do
+          let(:reference_number) { 'ABC12345' }
+
+          before do
+            create(:adviser, reference_number: reference_number)
+          end
+
+          it 'must not be valid' do
+            expect(build(:adviser,
+                         reference_number: reference_number,
+                         create_linked_lookup_advisor: false)).to_not be_valid
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.95
+  version: 0.0.96
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -307,6 +307,7 @@ files:
 - db/migrate/20151102113518_add_default_value_to_minimum_fixed_fee.rb
 - db/migrate/20151103161642_add_latitude_and_longitude_to_office.rb
 - db/migrate/20151111132037_remove_latitude_and_longitude_from_firm.rb
+- db/migrate/20160205150033_add_bypass_reference_number_check_to_advisers.rb
 - lib/mas/adviser_result.rb
 - lib/mas/elastic_search_client.rb
 - lib/mas/firm_indexer.rb
@@ -356,6 +357,8 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -480,6 +483,8 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html