Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Exception handling more readable

[#5601 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
commit 3c9bf6e1dc3066e32651c955c6e237488115354d 1 parent af6757a
@tchandy tchandy authored spastorino committed
View
16 actionpack/test/controller/assert_select_test.rb
@@ -459,8 +459,8 @@ def test_assert_select_rjs_for_remove_offers_useful_error_when_assertion_fails
assert_select_rjs :remove, "test1"
- rescue Assertion
- assert_equal "No RJS statement that removes 'test1' was rendered.", $!.message
+ rescue Assertion => e
+ assert_equal "No RJS statement that removes 'test1' was rendered.", e.message
end
def test_assert_select_rjs_for_remove_ignores_block
@@ -491,8 +491,8 @@ def test_assert_select_rjs_for_show_offers_useful_error_when_assertion_fails
assert_select_rjs :show, "test1"
- rescue Assertion
- assert_equal "No RJS statement that shows 'test1' was rendered.", $!.message
+ rescue Assertion => e
+ assert_equal "No RJS statement that shows 'test1' was rendered.", e.message
end
def test_assert_select_rjs_for_show_ignores_block
@@ -523,8 +523,8 @@ def test_assert_select_rjs_for_hide_offers_useful_error_when_assertion_fails
assert_select_rjs :hide, "test1"
- rescue Assertion
- assert_equal "No RJS statement that hides 'test1' was rendered.", $!.message
+ rescue Assertion => e
+ assert_equal "No RJS statement that hides 'test1' was rendered.", e.message
end
def test_assert_select_rjs_for_hide_ignores_block
@@ -555,8 +555,8 @@ def test_assert_select_rjs_for_toggle_offers_useful_error_when_assertion_fails
assert_select_rjs :toggle, "test1"
- rescue Assertion
- assert_equal "No RJS statement that toggles 'test1' was rendered.", $!.message
+ rescue Assertion => e
+ assert_equal "No RJS statement that toggles 'test1' was rendered.", e.message
end
def test_assert_select_rjs_for_toggle_ignores_block
View
4 activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -67,8 +67,8 @@ def self.establish_connection(spec = nil)
begin
require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
- rescue LoadError
- raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
+ rescue LoadError => e
+ raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{e})"
end
adapter_method = "#{spec[:adapter]}_connection"
View
8 activerecord/lib/active_record/railties/databases.rake
@@ -67,8 +67,8 @@ namespace :db do
# Create the SQLite database
ActiveRecord::Base.establish_connection(config)
ActiveRecord::Base.connection
- rescue
- $stderr.puts $!, *($!.backtrace)
+ rescue Exception => e
+ $stderr.puts e, *(e.backtrace)
$stderr.puts "Couldn't create database for #{config.inspect}"
end
end
@@ -113,8 +113,8 @@ namespace :db do
ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
ActiveRecord::Base.establish_connection(config)
- rescue
- $stderr.puts $!, *($!.backtrace)
+ rescue Exception => e
+ $stderr.puts e, *(e.backtrace)
$stderr.puts "Couldn't create database for #{config.inspect}"
end
end
View
4 activeresource/lib/active_resource/base.rb
@@ -589,8 +589,8 @@ def prefix_source() "#{value}" end
def prefix(options={}) "#{prefix_call}" end
RUBY_EVAL
end
- rescue
- logger.error "Couldn't set prefix: #{$!}\n #{code}" if logger
+ rescue Exception => e
+ logger.error "Couldn't set prefix: #{e}\n #{code}" if logger
raise
end
View
4 activesupport/lib/active_support/cache.rb
@@ -61,8 +61,8 @@ def self.lookup_store(*store_option)
store_class =
begin
require "active_support/cache/#{store}"
- rescue LoadError
- raise "Could not find cache store adapter for #{store} (#{$!})"
+ rescue LoadError => e
+ raise "Could not find cache store adapter for #{store} (#{e})"
else
ActiveSupport::Cache.const_get(store_class_name)
end
View
8 activesupport/lib/active_support/testing/performance.rb
@@ -58,16 +58,16 @@ def run_test(metric, mode)
metric.send(mode) { __send__ @method_name }
rescue ::Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
- rescue StandardError, ScriptError
- add_error($!)
+ rescue StandardError, ScriptError => e
+ add_error(e)
ensure
begin
teardown
run_callbacks :teardown, :enumerator => :reverse_each
rescue ::Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
- rescue StandardError, ScriptError
- add_error($!)
+ rescue StandardError, ScriptError => e
+ add_error(e)
end
end
View
4 activesupport/test/core_ext/duration_test.rb
@@ -53,8 +53,8 @@ def test_argument_error
flunk("no exception was raised")
rescue ArgumentError => e
assert_equal 'expected a time or date, got ""', e.message, "ensure ArgumentError is not being raised by dependencies.rb"
- rescue Exception
- flunk("ArgumentError should be raised, but we got #{$!.class} instead")
+ rescue Exception => e
+ flunk("ArgumentError should be raised, but we got #{e.class} instead")
end
end
View
4 activesupport/test/ordered_hash_test.rb
@@ -217,8 +217,8 @@ def test_alternate_initialization_raises_exception_on_odd_length_args
ActiveSupport::OrderedHash[1,2,3,4,5]
flunk "Hash::[] should have raised an exception on initialization " +
"with an odd number of parameters"
- rescue
- assert_equal "odd number of arguments for Hash", $!.message
+ rescue ArgumentError => e
+ assert_equal "odd number of arguments for Hash", e.message
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.