From 661ed303f49128b92a5a88d25deebcebbc891b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 23 May 2016 20:48:43 -0300 Subject: Revert "Add default exceptions affected by suppress (#25099)" This reverts commit 28492204ee59a5aca2f3bc7b161d45724552686d. Reason: `suppress` without an argument doesn't actually tell what is supressing. Also, it can be confused with ActiveRecord::Base#suppress. --- activesupport/lib/active_support/core_ext/kernel/reporting.rb | 1 - activesupport/test/core_ext/kernel_test.rb | 9 --------- 2 files changed, 10 deletions(-) (limited to 'activesupport') diff --git a/activesupport/lib/active_support/core_ext/kernel/reporting.rb b/activesupport/lib/active_support/core_ext/kernel/reporting.rb index 9e50ea23b7..d0197af95f 100644 --- a/activesupport/lib/active_support/core_ext/kernel/reporting.rb +++ b/activesupport/lib/active_support/core_ext/kernel/reporting.rb @@ -37,7 +37,6 @@ module Kernel # # puts 'This code gets executed and nothing related to ZeroDivisionError was seen' def suppress(*exception_classes) - exception_classes = StandardError if exception_classes.empty? yield rescue *exception_classes end diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb index bb634d6a09..503e6595cb 100644 --- a/activesupport/test/core_ext/kernel_test.rb +++ b/activesupport/test/core_ext/kernel_test.rb @@ -42,15 +42,6 @@ class KernelSuppressTest < ActiveSupport::TestCase end end - def test_suppress_with_defaults - suppress { raise RuntimeError } - suppress { raise ArgumentError } - - assert_raise(LoadError) do - suppress { raise LoadError } - end - end - def test_suppression suppress(ArgumentError) { raise ArgumentError } suppress(LoadError) { raise LoadError } -- cgit v1.2.3