diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-12-29 20:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 20:09:43 +0100 |
| commit | ca3eb2c1569a86e9c7eee2e9877dd773797a76b4 (patch) | |
| tree | 016b5f2247d6ad4d95f1b1f05c897b5472abb7bf /activerecord/test/cases/relation/or_test.rb | |
| parent | 654704247eba742e139cfaa8d1385f13605d9e12 (diff) | |
| parent | c491bf012948383632e53f874c552041a6e23b36 (diff) | |
| download | rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.gz rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.bz2 rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.zip | |
Merge branch 'master' into fix_26964
Diffstat (limited to 'activerecord/test/cases/relation/or_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation/or_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb index 2796595523..abb7ca72dd 100644 --- a/activerecord/test/cases/relation/or_test.rb +++ b/activerecord/test/cases/relation/or_test.rb @@ -79,7 +79,7 @@ module ActiveRecord expected = Post.where("id = 1 or id = 2").to_a p = Post.where("id = 1") p.load - assert_equal p.loaded?, true + assert_equal true, p.loaded? assert_equal expected, p.or(Post.where("id = 2")).to_a end |