Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 12 deletions

diff --git a/spec/lib/gitlab/database/load_balancing/service_discovery_spec.rb b/spec/lib/gitlab/database/load_balancing/service_discovery_spec.rb
index c1a8a612254..c3f7cf5059f 100644
--- a/spec/lib/gitlab/database/load_balancing/service_discovery_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing/service_discovery_spec.rb
@@ -6,10 +6,10 @@ RSpec.describe Gitlab::Database::LoadBalancing::ServiceDiscovery do
   let(:load_balancer) { Gitlab::Database::LoadBalancing::LoadBalancer.new([]) }
   let(:service) do
     described_class.new(
+      load_balancer,
       nameserver: 'localhost',
       port: 8600,
-      record: 'foo',
-      load_balancer: load_balancer
+      record: 'foo'
     )
   end
 
@@ -26,11 +26,11 @@ RSpec.describe Gitlab::Database::LoadBalancing::ServiceDiscovery do
     describe ':record_type' do
       subject do
         described_class.new(
+          load_balancer,
           nameserver: 'localhost',
           port: 8600,
           record: 'foo',
-          record_type: record_type,
-          load_balancer: load_balancer
+          record_type: record_type
         )
       end
 
@@ -217,11 +217,11 @@ RSpec.describe Gitlab::Database::LoadBalancing::ServiceDiscovery do
   describe '#addresses_from_dns' do
     let(:service) do
       described_class.new(
+        load_balancer,
         nameserver: 'localhost',
         port: 8600,
         record: 'foo',
-        record_type: record_type,
-        load_balancer: load_balancer
+        record_type: record_type
       )
     end
 
diff --git a/spec/lib/gitlab/database/load_balancing_spec.rb b/spec/lib/gitlab/database/load_balancing_spec.rb
index 6ec8e0516f6..08dc449ec60 100644
--- a/spec/lib/gitlab/database/load_balancing_spec.rb
+++ b/spec/lib/gitlab/database/load_balancing_spec.rb
@@ -204,9 +204,11 @@ RSpec.describe Gitlab::Database::LoadBalancing do
   end
 
   describe '.configure_proxy' do
-    it 'configures the connection proxy' do
+    before do
       allow(ActiveRecord::Base).to receive(:load_balancing_proxy=)
+    end
 
+    it 'configures the connection proxy' do
       described_class.configure_proxy
 
       expect(ActiveRecord::Base).to have_received(:load_balancing_proxy=)
@@ -214,15 +216,22 @@ RSpec.describe Gitlab::Database::LoadBalancing do
     end
 
     context 'when service discovery is enabled' do
-      let(:service_discovery) { double(Gitlab::Database::LoadBalancing::ServiceDiscovery) }
-
       it 'runs initial service discovery when configuring the connection proxy' do
+        discover = instance_spy(Gitlab::Database::LoadBalancing::ServiceDiscovery)
+
         allow(described_class)
           .to receive(:configuration)
           .and_return('discover' => { 'record' => 'foo' })
 
-        expect(Gitlab::Database::LoadBalancing::ServiceDiscovery).to receive(:new).and_return(service_discovery)
-        expect(service_discovery).to receive(:perform_service_discovery)
+        expect(Gitlab::Database::LoadBalancing::ServiceDiscovery)
+          .to receive(:new)
+          .with(
+            an_instance_of(Gitlab::Database::LoadBalancing::LoadBalancer),
+            an_instance_of(Hash)
+          )
+          .and_return(discover)
+
+        expect(discover).to receive(:perform_service_discovery)
 
         described_class.configure_proxy
       end
@@ -297,10 +306,16 @@ RSpec.describe Gitlab::Database::LoadBalancing do
         .and_return(true)
 
       instance = double(:instance)
+      lb = instance_spy(Gitlab::Database::LoadBalancing::LoadBalancer)
+      proxy = double(:proxy, load_balancer: lb)
+
+      allow(Gitlab::Database::LoadBalancing)
+        .to receive(:proxy)
+        .and_return(proxy)
 
       expect(Gitlab::Database::LoadBalancing::ServiceDiscovery)
         .to receive(:new)
-        .with(an_instance_of(Hash))
+        .with(lb, an_instance_of(Hash))
         .and_return(instance)
 
       expect(instance)