kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix some assert_raise calls containing messages in Active Support

Browse source
This commit is contained in:
Carlos Antonio da Silva 2012-10-28 17:54:06 -02:00
parent ed80dd7a56
commit d46f9e3731
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
activesupport/test/core_ext/module/qualified_const_test.rb
View file

@ -89,13 +89,20 @@ class QualifiedConstTest < ActiveSupport::TestCase
end
test "reject absolute paths" do
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X")}
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X::Y")}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X")}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X::Y")}
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X")}
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X::Y")}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X")}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X::Y")}
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X", nil)}
assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X::Y", nil)}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X", nil)}
assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X::Y", nil)}
end
private
def assert_raise_with_message(expected_exception, expected_message, &block)
exception = assert_raise(expected_exception, &block)
assert_equal expected_message, exception.message
end
end

3
activesupport/test/dependencies_test.rb
View file

@ -147,7 +147,8 @@ class DependenciesTest < ActiveSupport::TestCase
def test_circular_autoloading_detection
with_autoloading_fixtures do
assert_raise(RuntimeError, "Circular dependency detected while autoloading constant Circular1") { Circular1 }
e = assert_raise(RuntimeError) { Circular1 }
assert_equal "Circular dependency detected while autoloading constant Circular1", e.message
end
end