Skip to content

Commit

Permalink
Fix validation checks so that all associated records are validated (#…
Browse files Browse the repository at this point in the history
…5881) (#5882)

It was previously stopping at the first failed validation.
  • Loading branch information
jamis authored Oct 21, 2024
1 parent a1f1bbc commit 560ce66
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
7 changes: 5 additions & 2 deletions lib/mongoid/validatable/associated.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,16 @@ def validate_association(document, attribute)
# Now, treating the target as an array, look at each element
# and see if it is valid, but only if it has already been
# persisted, or changed, and hasn't been flagged for destroy.
list.all? do |value|
#
# use map.all? instead of just all?, because all? will do short-circuit
# evaluation and terminate on the first failed validation.
list.map do |value|
if value && !value.flagged_for_destroy? && (!value.persisted? || value.changed?)
value.validated? ? true : value.valid?
else
true
end
end
end.all?
end

document.errors.add(attribute, :invalid) unless valid
Expand Down
18 changes: 14 additions & 4 deletions spec/mongoid/validatable/associated_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,35 @@
User.new(name: "test")
end

let(:description) do
let(:description1) do
Description.new
end

let(:description2) do
Description.new
end

before do
user.descriptions << description
user.descriptions << description1
user.descriptions << description2
user.valid?
end

it "only validates the parent once" do
expect(user).to_not be_valid
end

it "adds the errors from the relation" do
user.valid?
expect(user.errors[:descriptions]).to_not be_nil
end

it 'reports all failed validations' do
errors = user.descriptions.flat_map { |d| d.errors[:details] }
expect(errors.length).to be == 2
end

it "only validates the child once" do
expect(description).to_not be_valid
expect(description1).to_not be_valid
end
end

Expand Down

0 comments on commit 560ce66

Please sign in to comment.