Skip to content

Commit e1b200c

Browse files
committed
Verify prepare callbacks in both merge directions
1 parent b4e0963 commit e1b200c

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

test/ecto/changeset_test.exs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -667,12 +667,11 @@ defmodule Ecto.ChangesetTest do
667667
cs1 = change(data) |> prepare_changes(&put_change(&1, :title, "Title"))
668668
cs2 = change(data) |> optimistic_lock(:upvotes)
669669

670-
changeset = merge(cs1, cs2)
671-
assert length(changeset.prepare) == 2
672-
assert changeset.filters == %{upvotes: 0}
673-
assert prepared_changes(changeset) == %{title: "Title", upvotes: 1}
674-
675-
assert length(merge(cs2, cs1).prepare) == 2
670+
for changeset <- [merge(cs1, cs2), merge(cs2, cs1)] do
671+
assert length(changeset.prepare) == 2
672+
assert changeset.filters == %{upvotes: 0}
673+
assert prepared_changes(changeset) == %{title: "Title", upvotes: 1}
674+
end
676675
end
677676

678677
test "merge/2: merges types" do

0 commit comments

Comments
 (0)