From dbe724341031dd47d26e11c86b2fa94674f90e7a Mon Sep 17 00:00:00 2001 From: Philipp Thun Date: Fri, 8 May 2026 10:10:11 +0200 Subject: [PATCH] Use have_queried_db_times matcher in lifecycle ordering tests Replace manual SQL logger capture with the existing have_queried_db_times matcher for consistency with the rest of the test suite. --- .../buildpack_lifecycle_data_model_spec.rb | 14 +++----------- .../runtime/cnb_lifecycle_data_model_spec.rb | 15 +++------------ 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb b/spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb index 57cf3463c4..bc67c1767e 100644 --- a/spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb +++ b/spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb @@ -14,18 +14,10 @@ module VCAP::CloudController describe 'buildpack_lifecycle_buildpacks association' do it 'orders by id via the default_order_by_id extension' do lifecycle_data.save - lifecycle_data.reload - sqls = [] - logger = Logger.new(StringIO.new) - logger.define_singleton_method(:info) { |msg| sqls << msg } - BuildpackLifecycleDataModel.db.loggers << logger - - lifecycle_data.buildpack_lifecycle_buildpacks - - BuildpackLifecycleDataModel.db.loggers.delete(logger) - sql = sqls.find { |s| s.include?('buildpack_lifecycle_buildpacks') } - expect(sql).to match(/ORDER BY .id./) + expect do + lifecycle_data.buildpack_lifecycle_buildpacks + end.to have_queried_db_times(/buildpack_lifecycle_buildpacks.*ORDER BY .id./i, 1) end end diff --git a/spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb b/spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb index d5d2cb534f..038b7eaeb6 100644 --- a/spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb +++ b/spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb @@ -6,18 +6,9 @@ module VCAP::CloudController describe 'buildpack_lifecycle_buildpacks association' do it 'orders by id via the default_order_by_id extension' do - lifecycle_data.reload - - sqls = [] - logger = Logger.new(StringIO.new) - logger.define_singleton_method(:info) { |msg| sqls << msg } - CNBLifecycleDataModel.db.loggers << logger - - lifecycle_data.buildpack_lifecycle_buildpacks - - CNBLifecycleDataModel.db.loggers.delete(logger) - sql = sqls.find { |s| s.include?('buildpack_lifecycle_buildpacks') } - expect(sql).to match(/ORDER BY .id./) + expect do + lifecycle_data.buildpack_lifecycle_buildpacks + end.to have_queried_db_times(/buildpack_lifecycle_buildpacks.*ORDER BY .id./i, 1) end end