Remove unnecessary begin..rescue..end, use only rescue

4 files changed, 17 insertions, 25 deletions

diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 62f82a4c7a..eb9143c8f6 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -157,13 +157,11 @@ module AbstractController
 
       private
       def self.layout(formats)
+        find_template(name.underscore, {:formats => formats}, :_prefixes => ["layouts"])
+      rescue ActionView::MissingTemplate
         begin
-          find_template(name.underscore, {:formats => formats}, :_prefixes => ["layouts"])
+          find_template("application", {:formats => formats}, :_prefixes => ["layouts"])
         rescue ActionView::MissingTemplate
-          begin
-            find_template("application", {:formats => formats}, :_prefixes => ["layouts"])
-          rescue ActionView::MissingTemplate
-          end
         end
       end
 
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index e79008fa9d..7960e5b55b 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -69,12 +69,10 @@ module AbstractController
       end
 
       def test_declare_missing_helper
-        begin
-          AbstractHelpers.helper :missing
-          flunk "should have raised an exception"
-        rescue LoadError => e
-          assert_equal "helpers/missing_helper.rb", e.path
-        end
+        AbstractHelpers.helper :missing
+        flunk "should have raised an exception"
+      rescue LoadError => e
+        assert_equal "helpers/missing_helper.rb", e.path
       end
 
       def test_helpers_with_module_through_block
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 1c59dd5953..3b79161ad3 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -450,11 +450,9 @@ class FilterTest < ActionController::TestCase
 
   class RescuingAroundFilterWithBlock
     def around(controller)
-      begin
-        yield
-      rescue ErrorToRescue => ex
-        controller.__send__ :render, :text => "I rescued this: #{ex.inspect}"
-      end
+      yield
+    rescue ErrorToRescue => ex
+      controller.__send__ :render, :text => "I rescued this: #{ex.inspect}"
     end
   end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 84a173980c..0e5bad7482 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -793,15 +793,13 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_line_offset
-    begin
-      get :render_line_offset
-      flunk "the action should have raised an exception"
-    rescue StandardError => exc
-      line = exc.backtrace.first
-      assert(line =~ %r{:(\d+):})
-      assert_equal "1", $1,
-        "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
-    end
+    get :render_line_offset
+    flunk "the action should have raised an exception"
+  rescue StandardError => exc
+    line = exc.backtrace.first
+    assert(line =~ %r{:(\d+):})
+    assert_equal "1", $1,
+      "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
   end
 
   # :ported: compatibility