Ensure that errors captured by rescue_from are not allowed to bubble up

to code examples. [#85]

Author: dchelimsky

lib/spec/rails/extensions/action_controller/rescue.rb

@@ -8,14 +8,18 @@ def use_rails_error_handling?
       @use_rails_error_handling ||= false
     end
 
-    protected
+  protected
+    
     def rescue_action_with_fast_errors(exception)
-      if use_rails_error_handling?
-        rescue_action_without_fast_errors exception
-      else
-        raise exception
+      unless rescue_with_handler(exception)
+        if use_rails_error_handling?
+          rescue_action_without_fast_errors exception
+        else
+          raise exception
+        end
       end
     end
     alias_method_chain :rescue_action, :fast_errors
+
   end
 end

spec/resources/controllers/controller_spec_controller.rb

@@ -88,7 +88,7 @@ def action_that_assigns_false_to_a_variable
   end
 
   class RescuedError < Exception; end
-  class OtherError < Exception; end
+  class UnRescuedError < Exception; end
   rescue_from RescuedError do |e|
     render :text => 'Rescued!'
   end
@@ -98,7 +98,7 @@ def rescued_error_action
   end
 
   def other_error_action
-    raise OtherError
+    raise UnRescuedError
   end
 
 end

spec/spec/rails/example/controller_spec_spec.rb

@@ -159,23 +159,51 @@
     end
 
     describe "with an error that is not rescued in the controller" do
-      it "should raise the error" do
-        lambda do
-          get 'other_error_action'
-        end.should raise_error(ControllerSpecController::OtherError)
+      context "without rails' error handling" do
+        it "raises the error" do
+          lambda do
+            get 'other_error_action'
+          end.should raise_error(ControllerSpecController::UnRescuedError)
+        end
+      end
+      context "with rails' error handling" do
+        it "does not raise the error" do
+          controller.use_rails_error_handling!
+          lambda do
+            get 'other_error_action'
+          end.should_not raise_error
+        end
       end
     end
 
     describe "with an error that is rescued in the controller" do
-      it "should not raise error" do
-        lambda do
+      context "without rails' error handling" do
+        it "does not raise error" do
+          lambda do
+            get 'rescued_error_action'
+          end.should_not raise_error
+        end
+
+        it "executes rescue_from" do
           get 'rescued_error_action'
-        end.should_not raise_error
+          response.body.should == 'Rescued!'
+        end
       end
 
-      it "should execute rescue_from" do
-        get 'rescued_error_action'
-        response.body.should == 'Rescued!'
+      context "with rails' error handling" do
+        before(:each) do
+          controller.use_rails_error_handling!
+        end
+        it "does not raise error" do
+          lambda do
+            get 'rescued_error_action'
+          end.should_not raise_error
+        end
+
+        it "executes rescue_from" do
+          get 'rescued_error_action'
+          response.body.should == 'Rescued!'
+        end
       end
     end