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.

Author: philippthun

spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb

@@ -14,18 +14,11 @@ 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
+        lifecycle_data.reload # clear cached association
 
-        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 {
+          lifecycle_data.buildpack_lifecycle_buildpacks
+        }.to have_queried_db_times(/buildpack_lifecycle_buildpacks.*ORDER BY .id./i, 1)
       end
     end
 

spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb

@@ -6,18 +6,11 @@ module VCAP::CloudController
 
     describe 'buildpack_lifecycle_buildpacks association' do
       it 'orders by id via the default_order_by_id extension' do
-        lifecycle_data.reload
+        lifecycle_data.reload # clear cached association
 
-        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 {
+          lifecycle_data.buildpack_lifecycle_buildpacks
+        }.to have_queried_db_times(/buildpack_lifecycle_buildpacks.*ORDER BY .id./i, 1)
       end
     end