diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-09-16 16:34:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 16:34:36 -0300 |
| commit | 84650022d574d24d6adea6ad941ec3ca57d2a2f0 (patch) | |
| tree | 07318ea156bb21b19042fe2bebc7a713ab0a02e7 /activerecord/test/cases/relation/merging_test.rb | |
| parent | c5c1a29be7d435fe569c9e15c22db65768b50318 (diff) | |
| parent | a9aed2ac94d2e0d1a233a3c193985ae78d7e79e9 (diff) | |
| download | rails-84650022d574d24d6adea6ad941ec3ca57d2a2f0.tar.gz rails-84650022d574d24d6adea6ad941ec3ca57d2a2f0.tar.bz2 rails-84650022d574d24d6adea6ad941ec3ca57d2a2f0.zip | |
Merge pull request #26516 from grosser/grosser/assert
improve error message when include assertions fail
Diffstat (limited to 'activerecord/test/cases/relation/merging_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index bc3b1de697..278dac8171 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -86,9 +86,9 @@ class RelationMergingTest < ActiveRecord::TestCase merged = left.merge(right) assert_equal expected, merged.bound_attributes - assert !merged.to_sql.include?("omg") - assert merged.to_sql.include?("wtf") - assert merged.to_sql.include?("bbq") + assert_not_includes merged.to_sql, "omg" + assert_includes merged.to_sql, "wtf" + assert_includes merged.to_sql, "bbq" end def test_merging_reorders_bind_params |