diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 21:23:47 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 21:23:47 -0200 |
| commit | a60e8ac79b7536fe0a3ff760488a437d4448619f (patch) | |
| tree | c3e8001025bfae01afa9787c45e443cf59473b54 /activerecord/test/cases/scoping | |
| parent | 787bbb8fbab0fe2ef2822d403078b72106365627 (diff) | |
| parent | b1d263505770f6dafe6c77fa33cf595f192441ba (diff) | |
| download | rails-a60e8ac79b7536fe0a3ff760488a437d4448619f.tar.gz rails-a60e8ac79b7536fe0a3ff760488a437d4448619f.tar.bz2 rails-a60e8ac79b7536fe0a3ff760488a437d4448619f.zip | |
Merge pull request #17558 from OpenSourceProjects/test_error_messages
Error message testing fix
Diffstat (limited to 'activerecord/test/cases/scoping')
| -rw-r--r-- | activerecord/test/cases/scoping/named_scoping_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb index 8cd94ebcc2..e4cc533517 100644 --- a/activerecord/test/cases/scoping/named_scoping_test.rb +++ b/activerecord/test/cases/scoping/named_scoping_test.rb @@ -317,13 +317,15 @@ class NamedScopingTest < ActiveRecord::TestCase ] conflicts.each do |name| - assert_raises(ArgumentError, "scope `#{name}` should not be allowed") do + e = assert_raises(ArgumentError, "scope `#{name}` should not be allowed") do klass.class_eval { scope name, ->{ where(approved: true) } } end + assert_match(/You tried to define a scope named \"#{name}\" on the model/, e.message) - assert_raises(ArgumentError, "scope `#{name}` should not be allowed") do + e = assert_raises(ArgumentError, "scope `#{name}` should not be allowed") do subklass.class_eval { scope name, ->{ where(approved: true) } } end + assert_match(/You tried to define a scope named \"#{name}\" on the model/, e.message) end non_conflicts.each do |name| |