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/scoping/default_scoping_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/scoping/default_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/scoping/default_scoping_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb index 6cfe4b9581..61062da3e1 100644 --- a/activerecord/test/cases/scoping/default_scoping_test.rb +++ b/activerecord/test/cases/scoping/default_scoping_test.rb @@ -63,7 +63,7 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_default_scoping_with_threads 2.times do Thread.new { - assert DeveloperOrderedBySalary.all.to_sql.include?("salary DESC") + assert_includes DeveloperOrderedBySalary.all.to_sql, "salary DESC" DeveloperOrderedBySalary.connection.close }.join end @@ -368,7 +368,7 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_unscoped_with_named_scope_should_not_have_default_scope assert_equal [DeveloperCalledJamis.find(developers(:poor_jamis).id)], DeveloperCalledJamis.poor - assert DeveloperCalledJamis.unscoped.poor.include?(developers(:david).becomes(DeveloperCalledJamis)) + assert_includes DeveloperCalledJamis.unscoped.poor, developers(:david).becomes(DeveloperCalledJamis) assert_equal 11, DeveloperCalledJamis.unscoped.length assert_equal 1, DeveloperCalledJamis.poor.length |