Skip to content

Use have_queried_db_times matcher in lifecycle ordering tests #5095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philippthun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use have_queried_db_times matcher in lifecycle ordering tests #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions spec/unit/models/runtime/buildpack_lifecycle_data_model_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 3 additions & 12 deletions spec/unit/models/runtime/cnb_lifecycle_data_model_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading