aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-08-26 17:21:22 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-08-26 17:21:22 +0900
commitca2a66abef16f0b0a529c1cd533e7ba179e30890 (patch)
tree47aa2928b53252de7bc57c58428e9f1499fae83a
parent7a9b93805bd6f901de72c8f84c75e4f52476a872 (diff)
downloadrails-ca2a66abef16f0b0a529c1cd533e7ba179e30890.tar.gz
rails-ca2a66abef16f0b0a529c1cd533e7ba179e30890.tar.bz2
rails-ca2a66abef16f0b0a529c1cd533e7ba179e30890.zip
Fix random CI failure due to non-deterministic sorting order
https://travis-ci.org/rails/rails/jobs/268599781#L784
-rw-r--r--activerecord/test/cases/associations_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 9d1999bcb1..de04221ea6 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -247,16 +247,16 @@ class AssociationProxyTest < ActiveRecord::TestCase
test "first! works on loaded associations" do
david = authors(:david)
- assert_equal david.posts.first, david.posts.reload.first!
- assert david.posts.loaded?
- assert_no_queries { david.posts.first! }
+ assert_equal david.first_posts.first, david.first_posts.reload.first!
+ assert david.first_posts.loaded?
+ assert_no_queries { david.first_posts.first! }
end
def test_pluck_uses_loaded_target
david = authors(:david)
- assert_equal david.posts.pluck(:title), david.posts.load.pluck(:title)
- assert david.posts.loaded?
- assert_no_queries { david.posts.pluck(:title) }
+ assert_equal david.first_posts.pluck(:title), david.first_posts.load.pluck(:title)
+ assert david.first_posts.loaded?
+ assert_no_queries { david.first_posts.pluck(:title) }
end
def test_reset_unloads_target