Skip to content

Commit 5383f67

Browse files
committed
Update CHANGELOG.md
1 parent b3d7757 commit 5383f67

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

activerecord/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Allow preloading of associations with instance dependent scopes
2+
3+
*John Hawthorn*, *John Crepezzi*, *Adam Hess*, *Eileen M. Uchitelle*, *Dinah Shi*
4+
15
* Do not try to rollback transactions that failed due to a `ActiveRecord::TransactionRollbackError`.
26

37
*Jamie McCarthy*

activerecord/test/cases/associations_test.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -494,12 +494,8 @@ def test_preload_with_instance_dependent_through_scope
494494
david = authors(:david)
495495
david2 = Author.create!(name: "David")
496496
bob = authors(:bob)
497-
comment1 = david.posts.first.comments.create!(
498-
body: "Great post david!"
499-
)
500-
comment2 = david.posts.first.comments.create!(
501-
body: "I don't agree david"
502-
)
497+
comment1 = david.posts.first.comments.create!(body: "Hi David!")
498+
comment2 = david.posts.first.comments.create!(body: "This comment mentions david")
503499

504500
assert_queries(2) do
505501
preloader = ActiveRecord::Associations::Preloader.new(records: [david, david2, bob], associations: :comments_mentioning_author)

0 commit comments

Comments
 (0)