Skip to content
This repository was archived by the owner on Jun 2, 2021. It is now read-only.

Commit 1acdcd0

Browse files
matt-royalcwlbraa
andcommitted
add buildpack name to unready validation failure message
[#173038631] Co-authored-by: Matt Royal <mroyal@pivotal.io> Co-authored-by: Connor Braa <cbraa@pivotal.io>
1 parent 6b900ca commit 1acdcd0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/models/runtime/app_model.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def validate_buildpacks_are_ready
169169
buildpack = Buildpack.find(name: blb.admin_buildpack_name)
170170

171171
if buildpack && buildpack.state != Buildpack::READY_STATE
172-
errors.add(:buildpack, 'must be in ready state')
172+
errors.add(:buildpack, "#{buildpack.name.inspect} must be in ready state")
173173
end
174174
end
175175
end

spec/unit/models/runtime/app_model_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,14 @@ module VCAP::CloudController
267267

268268
describe 'buildpacks' do
269269
let(:ready_buildpack) { Buildpack.make(filename: 'some-file') }
270-
let(:unready_buildpack) { Buildpack.make(filename: nil) }
270+
let(:unready_buildpack) { Buildpack.make(name: 'unready', filename: nil) }
271271
let!(:buildpack_lifecycle_data) { BuildpackLifecycleDataModel.make(app: app_model, buildpacks: [ready_buildpack.name, unready_buildpack.name]) }
272272

273273
it 'does not allow buildpacks that are not READY' do
274274
expect {
275275
app_model.buildpack_lifecycle_data = buildpack_lifecycle_data
276276
app_model.save
277-
}.to raise_error(Sequel::ValidationFailed, /must be in ready state/)
277+
}.to raise_error(Sequel::ValidationFailed, /"unready" must be in ready state/)
278278
end
279279

280280
it 'is valid with buildpacks that are READY' do

0 commit comments

Comments
 (0)