scooter 4.3.2 → 4.4.0

data/spec/scooter/httpdispatchers/classifier/classifier_spec.rb

@@ -343,12 +343,8 @@ module Scooter
 
       describe '.update_classes' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/classifier-api/v1/update-classes') { [201, {}] }
-          end
+          stub_request(:post, /classifier-api\/v1\/update-classes/).
+            to_return(status: 201, body: {}.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'updates the classes for all environments' do
           expect { subject.update_classes }.not_to raise_error
@@ -379,12 +375,8 @@ module Scooter
 
       describe '.get_list_of_node_groups' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/groups') { |env| [200, {}, group_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/groups/).
+            to_return(status: 200, body: group_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'returns list of groups' do
           expect { subject.get_list_of_node_groups }.not_to raise_error
@@ -395,12 +387,8 @@ module Scooter
 
       describe '.get_list_of_nodes' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/nodes') { |env| [200, {}, node_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/nodes/).
+            to_return(status: 200, body: node_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'returns list of nodes' do
           expect { subject.get_list_of_nodes }.not_to raise_error
@@ -411,12 +399,8 @@ module Scooter
 
       describe '.get_list_of_environments' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/environments') { |env| [200, {}, environment_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/environments/).
+            to_return(status: 200, body: environment_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'returns list of environments' do
           expect { subject.get_list_of_environments }.not_to raise_error
@@ -427,12 +411,8 @@ module Scooter
 
       describe '.get_list_of_classes' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/classes') { |env| [200, {}, class_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/classes/).
+            to_return(status: 200, body: class_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'returns list of classes' do
           expect { subject.get_list_of_classes }.not_to raise_error
@@ -443,12 +423,8 @@ module Scooter
 
       describe '.nodes_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/nodes') { |env| [200, {}, node_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/nodes/).
+            to_return(status: 200, body: node_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'nodes do not match' do
           expect(subject.nodes_match?(node_list.dup.push('another_array_item'))).to be false
@@ -461,12 +437,8 @@ module Scooter
 
       describe '.groups_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/groups') { |env| [200, {}, group_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/groups/).
+            to_return(status: 200, body: group_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'groups do not match' do
           expect(subject.groups_match?(group_list.dup.push('another_array_item'))).to be false
@@ -479,12 +451,8 @@ module Scooter
 
       describe '.classes_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/classes') { |env| [200, {}, class_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/classes/).
+            to_return(status: 200, body: class_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'classes do not match' do
           expect(subject.classes_match?(class_list.dup.push('another_array_item'))).to be false
@@ -497,12 +465,8 @@ module Scooter
 
       describe '.environments_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/environments') { |env| [200, {}, environment_list] }
-          end
+          stub_request(:get, /classifier-api\/v1\/environments/).
+            to_return(status: 200, body: environment_list.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'environments do not match' do
           expect(subject.environments_match?(environment_list.dup.push('another_array_item'))).to be false
@@ -515,23 +479,26 @@ module Scooter
 
       describe '.classifier_database_matches_self?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('classifier-api/v1/nodes') { |env| env[:url].to_s == "https://test.com:4433/classifier-api/v1/nodes" ?
-                [200, [], node_list] :
-                [200, [], node_list.dup.push('another_array_item')] }
-            stub.get('classifier-api/v1/environments') { |env| env[:url].to_s == "https://test.com:4433/classifier-api/v1/environments" ?
-                [200, [], environment_list] :
-                [200, [], environment_list.dup.push('another_array_item')] }
-            stub.get('classifier-api/v1/groups') { |env| env[:url].to_s == "https://test.com:4433/classifier-api/v1/groups" ?
-                [200, [], group_list] :
-                [200, [], group_list.dup.push('another_array_item')] }
-            stub.get('classifier-api/v1/classes') { |env| env[:url].to_s == "https://test.com:4433/classifier-api/v1/classes" ?
-                [200, [], class_list] :
-                [200, [], class_list.dup.push('another_array_item')] }
-          end
+          stub_request(:get, 'https://test.com:4433/classifier-api/v1/nodes').
+            to_return(status: 200, body: node_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, 'https://test2.com:4433/classifier-api/v1/nodes').
+            to_return(status: 200, body: node_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
+          stub_request(:get, 'https://test.com:4433/classifier-api/v1/environments').
+            to_return(status: 200, body: environment_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, 'https://test2.com:4433/classifier-api/v1/environments').
+            to_return(status: 200, body: environment_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
+          stub_request(:get, 'https://test.com:4433/classifier-api/v1/groups').
+            to_return(status: 200, body: group_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, 'https://test2.com:4433/classifier-api/v1/groups').
+            to_return(status: 200, body: group_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
+          stub_request(:get, 'https://test.com:4433/classifier-api/v1/classes').
+            to_return(status: 200, body: class_list.to_json, headers: {"Content-Type"=> "application/json"})
+          stub_request(:get, 'https://test2.com:4433/classifier-api/v1/classes').
+            to_return(status: 200, body: class_list.dup.push('another_array_item').to_json, headers: {"Content-Type"=> "application/json"})
+
           expect(subject).to receive(:is_resolvable).exactly(8).times.and_return(true)
         end
         it 'compare with self' do

data/spec/scooter/httpdispatchers/consoledispatcher_spec.rb

@@ -28,18 +28,19 @@ module Scooter
 
       context '"signin with a page that returns a token' do
         before do
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            head = {"server"=>"nginx/1.8.1", 
-                    "date"=>"Tue, 29 Nov 2016 22:05:41 GMT", 
-                    "content-length"=>"0", 
-                    "connection"=>"close", 
-                    "set-cookie"=>"JSESSIONID=b05e9b11-5e9f-4d6a-9faf-e28a0415197d; Path=/; Secure; HttpOnly, rememberMe=deleteMe; Path=/auth; Max-Age=0; Expires=Mon, 28-Nov-2016 22:05:41 GMT, pl_ssti=0CeHhpz5PPLna7kpaEMcTHjJ62z9eizHTzsxEXNK8W20;Secure;Path=/", 
-                    "location"=>"/", 
-                    "x-frame-options"=>"DENY"}
-            stub.post('/auth/login', "username=#{username}&password=#{password}") {[200, head, '']}
-            stub.get('/') {[200, {}, '']}
-          end
+          stub_request(:post, /auth\/login/).
+            to_return(status: 200,
+                      body: '',
+                      headers: {"server"=>"nginx/1.8.1",
+                                "date"=>"Tue, 29 Nov 2016 22:05:41 GMT",
+                                "content-length"=>"0",
+                                "connection"=>"close",
+                                "set-cookie"=>"JSESSIONID=b05e9b11-5e9f-4d6a-9faf-e28a0415197d; Path=/; Secure; HttpOnly, rememberMe=deleteMe; Path=/auth; Max-Age=0; Expires=Mon, 28-Nov-2016 22:05:41 GMT, pl_ssti=0CeHhpz5PPLna7kpaEMcTHjJ62z9eizHTzsxEXNK8W20;Secure;Path=/",
+                                "location"=>"/",
+                                "x-frame-options"=>"DENY"})
+
+          stub_request(:get, 'https://test.com/').
+            to_return(status: 200, body: '', headers: {})
         end
 
         it 'sends the credentials' do

data/spec/scooter/httpdispatchers/httpdispatcher_spec.rb

@@ -55,18 +55,14 @@ module Scooter
         before do
           allow_any_instance_of(Beaker::Http::FaradayBeakerLogger).to receive(:info) { true }
           allow_any_instance_of(Beaker::Http::FaradayBeakerLogger).to receive(:debug) { true }
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.get('/test/route') {[500,
-                                      {'content-type' => 'application/json;charset=UTF-8'},
-                                      "{ \"key\" : \"value\" }"]}
-          end
+
+          stub_request(:get, /test\/route/).
+            to_return(status: 500, body: {"key" => "value"}.to_json, headers: {"Content-Type"=> "application/json"})
         end
         it 'has a correctly parsed body in the error' do
           expect{subject.connection.get('/test/route')}.to raise_error do |error|
             expect(error.response[:body]).to be_a(Hash)
           end
-
         end
       end
     end

data/spec/scooter/httpdispatchers/orchestratordispatcher_spec.rb

@@ -4,12 +4,18 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
 
   let(:orchestrator_api) { Scooter::HttpDispatchers::OrchestratorDispatcher.new(host) }
   let(:job_id) { random_string }
+  let(:schedule_task_payload) {
+    { 'task' => 'foo' }
+  }
+  let(:schedule_plan_payload) {
+    { 'plan' => 'foo' }
+  }
   let(:environment) {random_string}
   let(:logger) { double('logger')}
 
 
-  unixhost = { roles:     ['test_role'],
-                   'platform' => 'debian-7-x86_64' }
+  unixhost = { roles: ['test_role'],
+               'platform' => 'debian-7-x86_64' }
   let(:host) { Beaker::Host.create('test.com', unixhost, {:logger => logger}) }
 
   subject { orchestrator_api }
@@ -39,9 +45,21 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
     it { is_expected.to respond_to(:list_jobs).with(1).arguments }
     it { is_expected.not_to respond_to(:list_jobs).with(2).arguments }
 
-    it 'should take a job_id' do
+    it 'should accept a max jobs argument' do
       expect(orchestrator_api.connection).to receive(:get).with('v1/jobs')
-      expect{ orchestrator_api.list_jobs }.not_to raise_error
+      expect{ orchestrator_api.list_jobs(1) }.not_to raise_error
+    end
+  end
+
+  describe '.list_plan_jobs' do
+
+    it { is_expected.to respond_to(:list_jobs).with(0).arguments }
+    it { is_expected.to respond_to(:list_jobs).with(1).arguments }
+    it { is_expected.not_to respond_to(:list_jobs).with(2).arguments }
+
+    it 'should take accept a max plan_jobs argument' do
+      expect(orchestrator_api.connection).to receive(:get).with('v1/plan_jobs')
+      expect{ orchestrator_api.list_plan_jobs(1) }.not_to raise_error
     end
   end
 
@@ -72,7 +90,6 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
     it { is_expected.not_to respond_to(:get_job_report).with(0).arguments }
     it { is_expected.to respond_to(:get_job_report).with(1).arguments }
 
-
     it 'should take a job_id' do
       expect(orchestrator_api.connection).to receive(:get).with("v1/jobs/#{job_id}/report")
       expect{ orchestrator_api.get_job_report(job_id) }.not_to raise_error
@@ -172,9 +189,14 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
     it { is_expected.to respond_to(:create_scheduled_job).with(1).arguments }
     it { is_expected.not_to respond_to(:create_scheduled_job).with(2).arguments }
 
-    it 'should take a job id' do
+    it 'should schedule a task' do
       expect(orchestrator_api.connection).to receive(:post).with("v1/command/schedule_task")
-      expect{ orchestrator_api.create_scheduled_job(job_id) }.not_to raise_error
+      expect{ orchestrator_api.create_scheduled_job(schedule_task_payload) }.not_to raise_error
+    end
+
+    it 'should schedule a plan' do
+      expect(orchestrator_api.connection).to receive(:post).with("v1/command/schedule_plan")
+      expect{ orchestrator_api.create_scheduled_job(schedule_plan_payload) }.not_to raise_error
     end
   end
 
@@ -229,12 +251,8 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
     it {is_expected.to respond_to(:get_last_jobs).with(4).arguments }
 
     before do
-      # find the index of the default Faraday::Adapter::NetHttp handler
-      # and replace it with the Test adapter
-      index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-      subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-        stub.get('/orchestrator/v1/jobs') { [200, {}] }
-      end
+      stub_request(:get, /orchestrator\/v1\/jobs/).
+        to_return(status: 200, body: {}.to_json, headers: {"Content-Type"=> "application/json"})
     end
 
     it 'should make a request with query params' do
@@ -276,12 +294,8 @@ describe Scooter::HttpDispatchers::OrchestratorDispatcher do
     it {is_expected.to respond_to(:list_scheduled_jobs).with(2).arguments }
 
     before do
-      # find the index of the default Faraday::Adapter::NetHttp handler
-      # and replace it with the Test adapter
-      index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-      subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-        stub.get('/orchestrator/v1/scheduled_jobs') { [200, {}] }
-      end
+      stub_request(:get, /orchestrator\/v1\/scheduled_jobs/).
+        to_return(status: 200, body: {}.to_json, headers: {"Content-Type"=> "application/json"})
     end
 
     it 'should make a request with query params' do

data/spec/scooter/httpdispatchers/puppetdbdispatcher_spec.rb

@@ -29,12 +29,8 @@ module Scooter
     context 'with a beaker host passed in' do
       describe '.query_nodes' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/nodes') { [200, []] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/nodes/).
+            to_return(status: 200, body: [], headers: {})
         end
         it 'query for all nodes' do
           expect { subject.query_nodes }.not_to raise_error
@@ -51,12 +47,8 @@ module Scooter
 
       describe '.query_catalogs' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/catalogs') { [200, []] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/catalogs/).
+            to_return(status: 200, body: [], headers: {})
         end
         it 'query for all catalogs' do
           expect { subject.query_catalogs }.not_to raise_error
@@ -73,12 +65,8 @@ module Scooter
 
       describe '.query_reports' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/reports') { [200, []] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/reports/).
+            to_return(status: 200, body: [], headers: {})
         end
         it 'query for all reports' do
           expect { subject.query_reports }.not_to raise_error
@@ -95,12 +83,8 @@ module Scooter
 
       describe '.query_facts' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/facts') { [200, []] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/facts/).
+            to_return(status: 200, body: [], headers: {})
         end
         it 'query for all facts' do
           expect { subject.query_facts }.not_to raise_error
@@ -121,12 +105,10 @@ module Scooter
 
       describe '.nodes_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/nodes') { [200, [], [{ 'certname' => 'name', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }]] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/nodes/).
+            to_return(status: 200,
+                      body: [{ 'certname' => 'name', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }],
+                      headers: {})
         end
         it 'nodes different size' do
           expect(subject.send(:nodes_match?, [{ 'certname' => 'name', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' },
@@ -148,12 +130,10 @@ module Scooter
 
       describe '.catalogs_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/catalogs') { [200, [], [{ 'catalog_uuid' => 'catalog_uuid_1', 'producer_timestamp' => 'time' }]] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/catalogs/).
+            to_return(status: 200,
+                      body: [{ 'catalog_uuid' => 'catalog_uuid_1', 'producer_timestamp' => 'time' }],
+                      headers: {})
         end
         it 'catalogs different size' do
           expect(subject.send(:catalogs_match?, [{ 'catalog_uuid' => 'catalog_uuid_1', 'producer_timestamp' => 'time' },
@@ -170,13 +150,12 @@ module Scooter
 
       describe '.facts_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/facts') { [200, [], [{ 'name' => 'name', 'value' => 'value' }]] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/facts/).
+            to_return(status: 200,
+                      body: [{ 'name' => 'name', 'value' => 'value' }],
+                      headers: {})
         end
+
         it 'facts different size' do
           expect(subject.send(:facts_match?, [{ 'name' => 'name', 'value' => 'value' },
                                               { 'name2' => 'name', 'value2' => 'value' }])).to be false
@@ -192,12 +171,10 @@ module Scooter
 
       describe '.reports_match?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/reports') { [200, [], [{ 'hash' => 'hash_value', 'producer_timestamp' => 'time' }]] }
-          end
+          stub_request(:post, /pdb\/query\/v4\/reports/).
+            to_return(status: 200,
+                      body: [{ 'hash' => 'hash_value', 'producer_timestamp' => 'time' }],
+                      headers: {})
         end
         it 'reports different size' do
           expect(subject.send(:reports_match?, [{ 'hash' => 'hash_value', 'producer_timestamp' => 'time' },
@@ -214,23 +191,43 @@ module Scooter
 
       describe '.replica_db_synced_with_master_db?' do
         before do
-          # find the index of the default Faraday::Adapter::NetHttp handler
-          # and replace it with the Test adapter
-          index = subject.connection.builder.handlers.index(Faraday::Adapter::NetHttp)
-          subject.connection.builder.swap(index, Faraday::Adapter::Test) do |stub|
-            stub.post('/pdb/query/v4/nodes') { |env| env[:url].to_s == "https://test.com:8081/pdb/query/v4/nodes" ?
-                [200, [], [{ 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }, { 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }]] :
-                [200, [], [{ 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }, { 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }]] }
-            stub.post('/pdb/query/v4/catalogs') { |env| env[:url].to_s == "https://test.com:8081/pdb/query/v4/catalogs" ?
-                [200, [], [{ 'certname' => 'test.com', 'catalog_uuid' => 'catalog_uuid_1', 'producer_timestamp' => 'time' }]] :
-                [200, [], [{ 'certname' => 'test2.com', 'catalog_uuid' => 'catalog_uuid_2', 'producer_timestamp' => 'time2' }]] }
-            stub.post('/pdb/query/v4/facts') { |env| env[:url].to_s == "https://test.com:8081/pdb/query/v4/facts" ?
-                [200, [], [{ 'name' => 'name', 'value' => 'value' }]] :
-                [200, [], [{ 'name' => 'name2', 'value' => 'value2' }]] }
-            stub.post('/pdb/query/v4/reports') { |env| env[:url].to_s == "https://test.com:8081/pdb/query/v4/reports" ?
-                [200, [], [{ 'certname' => 'test.com', 'hash' => 'hash_value', 'producer_timestamp' => 'time' }]] :
-                [200, [], [{ 'certname' => 'test2.com', 'hash' => 'hash_value2', 'producer_timestamp' => 'time2' }]] }
-          end
+          stub_request(:post, "https://test.com:8081/pdb/query/v4/nodes").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }, { 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }],
+                      headers: {})
+          stub_request(:post, "https://test2.com:8081/pdb/query/v4/nodes").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test2.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }, { 'certname' => 'test.com', 'facts_timestamp' => 'facts_time', 'report_timestamp' => 'reports_time', 'catalog_timestamp' => 'catalog_time' }],
+                      headers: {})
+
+          stub_request(:post, "https://test.com:8081/pdb/query/v4/catalogs").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test.com', 'catalog_uuid' => 'catalog_uuid_1', 'producer_timestamp' => 'time' }],
+                      headers: {})
+          stub_request(:post, "https://test2.com:8081/pdb/query/v4/catalogs").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test2.com', 'catalog_uuid' => 'catalog_uuid_2', 'producer_timestamp' => 'time2' }],
+                      headers: {})
+
+          stub_request(:post, "https://test.com:8081/pdb/query/v4/facts").
+            to_return(status: 200,
+                      body: [{ 'name' => 'name', 'value' => 'value' }],
+                      headers: {})
+          stub_request(:post, "https://test2.com:8081/pdb/query/v4/facts").
+            to_return(status: 200,
+                      body: [{ 'name' => 'name2', 'value' => 'value2' }],
+                      headers: {})
+
+          stub_request(:post, "https://test.com:8081/pdb/query/v4/reports").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test.com', 'hash' => 'hash_value', 'producer_timestamp' => 'time' }],
+                      headers: {})
+          stub_request(:post, "https://test2.com:8081/pdb/query/v4/reports").
+            to_return(status: 200,
+                      body: [{ 'certname' => 'test2.com', 'hash' => 'hash_value2', 'producer_timestamp' => 'time2' }],
+                      headers: {})
+
+
           expect(subject).to receive(:is_resolvable).exactly(8).times.and_return(true)
           expect(subject).to receive(:master_has_node?).twice.and_return(true)
         end