Enhance test

Author: kathap

spec/unit/jobs/v3/services/update_broker_job_spec.rb

@@ -447,26 +447,36 @@ module V3
           end
 
           context 'when database disconnects during state rollback' do
+            let(:catalog_error) { StandardError.new('Catalog fetch failed') }
+
             before do
-              setup_broker_with_invalid_catalog
+              # Simulate catalog refresh failure
+              allow_any_instance_of(VCAP::CloudController::V3::ServiceBrokerCatalogUpdater).to receive(:refresh).and_raise(catalog_error)
 
-              # Mock the where clause to raise database error only when called from rescue block
-              # We detect this by checking if it's being called with just an id condition
-              call_count = 0
-              allow(ServiceBroker).to receive(:where).and_wrap_original do |original_method, *args|
-                call_count += 1
-                # The rescue block calls ServiceBroker.where(id: ...).update(state: ...)
-                # This is the only place that calls .where with just {:id => ...}
-                raise Sequel::DatabaseDisconnectError.new('connection lost') if args.first.is_a?(Hash) && args.first.keys == [:id] && call_count > 1
+              # Create a mock dataset that raises database error on update
+              mock_dataset = instance_double(Sequel::Postgres::Dataset)
+              allow(mock_dataset).to receive(:update).and_raise(Sequel::DatabaseDisconnectError.new('connection lost'))
 
-                original_method.call(*args)
-              end
+              # Mock ServiceBroker.where to return the mock dataset for the state rollback call
+              allow(ServiceBroker).to receive(:where).and_call_original
+              allow(ServiceBroker).to receive(:where).with(id: broker.id).and_return(mock_dataset)
             end
 
-            it 'handles the database error gracefully and re-raises the original error' do
-              expect { job.perform }.to raise_error(::CloudController::Errors::ApiError) do |error|
-                expect(error.message).to include('Service broker catalog is invalid')
-              end
+            it 'swallows the database error and re-raises the original catalog error' do
+              # With the fix: original error is raised, database error is swallowed
+              # Without the fix: database error would be raised instead
+              expect { job.perform }.to raise_error(catalog_error)
+            end
+
+            it 'does not raise a database connection error' do
+              # This verifies the fix: database errors during rollback should be caught
+              expect { job.perform }.not_to raise_error(Sequel::DatabaseDisconnectError)
+            end
+
+            it 'still cleans up the update request' do
+              # Ensure the ensure block still executes
+              expect { job.perform }.to raise_error(catalog_error)
+              expect(ServiceBrokerUpdateRequest.where(id: update_broker_request.id).all).to be_empty
             end
           end