dchelimsky-rspec-rails 1.1.99.5 → 1.1.99.6

data/History.txt

@@ -1,6 +1,6 @@
 === Version 1.1.99.4 (in git)
 
-IMPORTANT: See Upgrade.txt for information about upgrading to rspec-rails-1.1.99.4
+IMPORTANT: See Upgrade.markdown for information about upgrading to rspec-rails-1.1.99.4
 
 IMPORTANT: This release includes the following backwards-compatibility-breaking changes.
 
@@ -16,6 +16,11 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
 
   * see Upgrade.txt for more information
   
+* deprecations
+
+  * controller.use_rails_error_handling! is deprecated
+    * use rescue_action_in_public! (from rails) instead
+  
 * enhancements
 
   * Adding status codes to redirect_to matcher (Damian Janowski). Closes #570.
@@ -28,6 +33,7 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * redirect_to and render_template matchers can accept controller or response (Joe Ferris). Closes #686. 
   * generated specs use declarative docstrings
   * rspec_scaffold generator generates layout and stylesheet (per Rails-2.3)
+  * add bypass_rescue for controller specs
   
 * bug fixes
 

data/Manifest.txt

@@ -4,7 +4,7 @@ Manifest.txt
 README.txt
 Rakefile
 TODO.txt
-Upgrade.txt
+Upgrade.markdown
 features/step_definitions/people.rb
 features/support/env.rb
 features/transactions/transactions_should_rollback.feature
@@ -51,6 +51,7 @@ lib/spec/rails/example/routing_helpers.rb
 lib/spec/rails/example/view_example_group.rb
 lib/spec/rails/extensions.rb
 lib/spec/rails/extensions/action_controller/rescue.rb
+lib/spec/rails/extensions/action_controller/test_case.rb
 lib/spec/rails/extensions/action_controller/test_response.rb
 lib/spec/rails/extensions/action_view/base.rb
 lib/spec/rails/extensions/active_record/base.rb
@@ -135,13 +136,13 @@ spec/spec/rails/example/configuration_spec.rb
 spec/spec/rails/example/controller_example_group_spec.rb
 spec/spec/rails/example/controller_isolation_spec.rb
 spec/spec/rails/example/cookies_proxy_spec.rb
+spec/spec/rails/example/error_handling_spec.rb
 spec/spec/rails/example/example_group_factory_spec.rb
 spec/spec/rails/example/helper_example_group_spec.rb
 spec/spec/rails/example/model_example_group_spec.rb
 spec/spec/rails/example/shared_behaviour_spec.rb
 spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
 spec/spec/rails/example/view_example_group_spec.rb
-spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
 spec/spec/rails/extensions/action_view_base_spec.rb
 spec/spec/rails/extensions/active_record_spec.rb
 spec/spec/rails/interop/testcase_spec.rb

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["dchelimsky-rspec","1.1.99.5"],["rack",">=0.4.0"]]
+  p.extra_deps = [["dchelimsky-rspec","1.1.99.6"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end

data/Upgrade.markdown

@@ -0,0 +1,51 @@
+# Upgrade to rspec-rails-1.1.99.x
+
+## Supported Rails Versions
+
+This release supports the following versions of rails:
+
+* 2.0.5
+* 2.1.2
+* 2.2.2
+* 2.3.0
+
+## update generated files
+
+Be sure to run "script/generate rspec" and allow the following files to be overwritten:
+
+* lib/tasks/rspec.rake
+* script/spec_server
+
+## controller.use\_rails\_error\_handling! is deprecated
+
+Use rescue\_action\_in\_public! instead. It comes directly from rails and does
+exactly the same thing
+
+## route_for
+
+After a change to edge rails broke our monkey-patched #route_for method, I
+decided to just delegate to rails' #assert_generates method. For most cases,
+this will not present a problem, but for some it might. You'll know if you
+upgrade and see any newly failing, route-related examples. Here are the things
+that you might need to change.
+
+* Make sure IDs are strings
+
+If you had :id => 1 before, you need to change that to :id => "1"
+
+	  #old
+	  route_for(:controller => 'things', :action => 'show', :id => 1).should == "/things/1"
+  
+	  #new
+	  route_for(:controller => 'things', :action => 'show', :id => "1").should == "/things/1"
+  
+* Convert paths for non-get methods to hashes
+
+If you had an example with a route that requires post, put, or delete, you'll
+need to declare that explicitly.
+
+	  #old
+	  route_for(:controller => 'things', :action => 'create').should == "/things"
+  
+	  #new
+	  route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}

data/lib/spec/rails/example/controller_example_group.rb

@@ -3,21 +3,22 @@ module Spec
     module Example
       # Controller Examples live in $RAILS_ROOT/spec/controllers/.
       #
-      # Controller Examples use Spec::Rails::Example::ControllerExampleGroup, which supports running specs for
-      # Controllers in two modes, which represent the tension between the more granular
-      # testing common in TDD and the more high level testing built into
-      # rails. BDD sits somewhere in between: we want to a balance between
-      # specs that are close enough to the code to enable quick fault
-      # isolation and far enough away from the code to enable refactoring
-      # with minimal changes to the existing specs.
+      # Controller Examples use Spec::Rails::Example::ControllerExampleGroup,
+      # which supports running specs for Controllers in two modes, which
+      # represent the tension between the more granular testing common in TDD
+      # and the more high level testing built into rails. BDD sits somewhere
+      # in between: we want to a balance between specs that are close enough
+      # to the code to enable quick fault isolation and far enough away from
+      # the code to enable refactoring with minimal changes to the existing
+      # specs.
       #
       # == Isolation mode (default)
       #
-      # No dependencies on views because none are ever rendered. The
-      # benefit of this mode is that can spec the controller completely
-      # independent of the view, allowing that responsibility to be
-      # handled later, or by somebody else. Combined w/ separate view
-      # specs, this also provides better fault isolation.
+      # No dependencies on views because none are ever rendered. The benefit
+      # of this mode is that can spec the controller completely independent of
+      # the view, allowing that responsibility to be handled later, or by
+      # somebody else. Combined w/ separate view specs, this also provides
+      # better fault isolation.
       #
       # == Integration mode
       #
@@ -28,13 +29,12 @@ module Spec
       #     integrate_views
       #     ...
       #
-      # In this mode, controller specs are run in the same way that
-      # rails functional tests run - one set of tests for both the
-      # controllers and the views. The benefit of this approach is that
-      # you get wider coverage from each spec. Experienced rails
-      # developers may find this an easier approach to begin with, however
-      # we encourage you to explore using the isolation mode and revel
-      # in its benefits.
+      # In this mode, controller specs are run in the same way that rails
+      # functional tests run - one set of tests for both the controllers and
+      # the views. The benefit of this approach is that you get wider coverage
+      # from each spec. Experienced rails developers may find this an easier
+      # approach to begin with, however we encourage you to explore using the
+      # isolation mode and revel in its benefits.
       #
       # == Expecting Errors
       #
@@ -44,14 +44,15 @@ module Spec
       class ControllerExampleGroup < FunctionalExampleGroup
         class << self
                     
-          # Use this to instruct RSpec to render views in your controller examples (Integration Mode).
+          # Use integrate_views to instruct RSpec to render views in
+          # your controller examples in Integration mode.
           #
           #   describe ThingController do
           #     integrate_views
           #     ...
           #
-          # See Spec::Rails::Example::ControllerExampleGroup for more information about
-          # Integration and Isolation modes.
+          # See Spec::Rails::Example::ControllerExampleGroup for more
+          # information about Integration and Isolation modes.
           def integrate_views(integrate_views = true)
             @integrate_views = integrate_views
           end
@@ -66,14 +67,18 @@ module Spec
             super
           end
           
-          def set_description(*args)
+          def set_description(*args) # :nodoc:
             super
             if described_class && described_class.ancestors.include?(ActionController::Base)
               tests described_class
             end
           end
 
-          # You MUST provide a controller_name within the context of
+          # When you don't pass a controller to describe, like this:
+          #
+          #   describe ThingsController do
+          #
+          # ... then you must provide a controller_name within the context of
           # your controller specs:
           #
           #   describe "ThingController" do
@@ -94,19 +99,20 @@ module Spec
           end
 
           unless @controller.class.ancestors.include?(ActionController::Base)
-            Spec::Expectations.fail_with <<-EOE
-            You have to declare the controller name in controller specs. For example:
-            describe "The ExampleController" do
-            controller_name "example" #invokes the ExampleController
-            end
-            EOE
-          end
-          (class << @controller; self; end).class_eval do
-            def controller_path #:nodoc:
-              self.class.name.underscore.gsub('_controller', '')
-            end
-            include ControllerInstanceMethods
+            Spec::Expectations.fail_with <<-MESSAGE
+Controller specs need to know what controller is being specified. You can
+indicate this by passing the controller to describe():
+
+  describe MyController do
+    
+or by declaring the controller's name
+
+  describe "a MyController" do
+    controller_name :my #invokes the MyController
+end
+MESSAGE
           end
+          @controller.extend ControllerInstanceMethods
           @controller.integrate_views! if @integrate_views
           @controller.session = session
         end
@@ -118,12 +124,28 @@ module Spec
           @integrate_views = self.class.integrate_views?
         end
         
+        # Bypasses any error rescues defined with rescue_from. Useful
+        # in cases in which you want to specify errors coming out of
+        # actions that might be caught by a rescue_from clause that is
+        # specified separately.
+        #
+        # Note that this will override the effect of rescue_action_in_public
+        def bypass_rescue
+          if ::Rails::VERSION::STRING >= '2.2'
+            def controller.rescue_action(exception)
+              raise exception
+            end
+          else
+            def controller.rescue_action_with_handler(exception)
+              raise exception
+            end
+          end
+        end
+        
       protected
 
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            @response.template
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {@response.template}
         end
 
       private
@@ -146,24 +168,33 @@ module Spec
           end
           
           def render(*args)
-            if @_rendered
-              opts = args[0]
-              (@_rendered[:template] ||= opts[:file]) if opts[:file]
-              (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
-            else
-              super
-            end
+            @_rendered ? record_render(args[0]) : super
+          end
+        
+        private
+        
+          def record_render(opts)
+            (@_rendered[:template] ||= opts[:file]) if opts[:file]
+            (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+          end
+          
+          # Returned by _pick_template when running controller examples in isolation mode.
+          class PickedTemplate 
+            # Do nothing when running controller examples in isolation mode.
+            def render_template(*ignore_args); end
+            # Do nothing when running controller examples in isolation mode.
+            def render_partial(*ignore_args);  end
           end
         end
-
-        module ControllerInstanceMethods #:nodoc:
+        
+        module ControllerInstanceMethods # :nodoc:
           include Spec::Rails::Example::RenderObserver
 
           # === render(options = nil, extra_options={}, &block)
           #
           # This gets added to the controller's singleton meta class,
           # allowing Controller Examples to run in two modes, freely switching
-          # from context to context.
+          # from example group to example group.
           def render(options=nil, extra_options={}, &block)
             unless block_given?
               unless integrate_views?
@@ -193,31 +224,24 @@ module Spec
             @integrate_views = true
           end
 
-          private
+        private
 
           def integrate_views?
             @integrate_views
           end
 
           def matching_message_expectation_exists(options)
-            render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+            render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
           end
         
           def matching_stub_exists(options)
-            render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+            render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)
           end
         
         end
 
         Spec::Example::ExampleGroupFactory.register(:controller, self)
-      end
-      
-      # Returned by _pick_template when running controller examples in isolation mode.
-      class PickedTemplate 
-        # Do nothing when running controller examples in isolation mode.
-        def render_template(*ignore_args); end
-        # Do nothing when running controller examples in isolation mode.
-        def render_partial(*ignore_args);  end
+        
       end
     end
   end

data/lib/spec/rails/example/helper_example_group.rb

@@ -155,11 +155,10 @@ module Spec
 
         Spec::Example::ExampleGroupFactory.register(:helper, self)
 
-        protected
+      protected
+
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            helper
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {helper}
         end
 
       end

data/lib/spec/rails/example/view_example_group.rb

@@ -56,14 +56,14 @@ module Spec
         end
 
         before {ensure_that_flash_and_session_work_properly}
-        after {ensure_that_base_view_path_is_not_set_across_example_groups}
+        after  {ensure_that_base_view_path_is_not_set_across_example_groups}
 
         def ensure_that_flash_and_session_work_properly #:nodoc:
-          @controller.send :initialize_template_class, @response
-          @controller.send :assign_shortcuts, @request, @response
-          @controller.send :initialize_current_url
+          @controller.class.__send__ :public, :flash
+          @controller.__send__ :initialize_template_class, @response
+          @controller.__send__ :assign_shortcuts, @request, @response
+          @controller.__send__ :initialize_current_url
           @session = @controller.session
-          @controller.class.send :public, :flash
         end
 
         def ensure_that_base_view_path_is_not_set_across_example_groups #:nodoc:
@@ -134,7 +134,7 @@ module Spec
           defaults = { :layout => false }
           options = defaults.merge options
 
-          @controller.send(:params).reverse_merge! @request.parameters
+          @controller.__send__(:params).reverse_merge! @request.parameters
 
           @controller.class.instance_eval %{
             def controller_path
@@ -146,9 +146,9 @@ module Spec
             end
           }
 
-          @controller.send :forget_variables_added_to_assigns
-          @controller.send :render, options
-          @controller.send :process_cleanup
+          @controller.__send__ :forget_variables_added_to_assigns
+          @controller.__send__ :render, options
+          @controller.__send__ :process_cleanup
         end
 
         # This provides the template. Use this to set mock
@@ -168,11 +168,9 @@ module Spec
 
         Spec::Example::ExampleGroupFactory.register(:view, self)
 
-        protected
+      protected
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            @response.template
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {@response.template}
         end
       end
 

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

@@ -1,25 +1,42 @@
 module ActionController
   module Rescue
     def use_rails_error_handling!
-      @use_rails_error_handling = true
-    end
+      Kernel.warn <<-WARNING
+DEPRECATION NOTICE: controller.use_rails_error_handling! is
+deprecated and will be removed from a future version of
+rspec-rails.
 
+Use rescue_action_in_public!, which is defined directly in
+rails' testing framework, instead.
+WARNING
+      if Rails::VERSION::STRING =~ /^2\.0/
+        @use_rails_error_handling = true
+      else
+        # anything but 0.0.0.0 - borrowed from rails own rescue_action_in_public!
+        request.remote_addr = '208.77.188.166'
+      end
+    end
+    
     def use_rails_error_handling?
       @use_rails_error_handling ||= false
     end
 
   protected
   
-    def rescue_action_with_fast_errors(exception)
-      unless respond_to?(:rescue_with_handler) and rescue_with_handler(exception)
-        if use_rails_error_handling?
-          rescue_action_without_fast_errors exception
+    if Rails::VERSION::STRING =~ /^2\.0/
+      def rescue_action_in_public?
+        request.respond_to?(:rescue_action_in_public?) and request.rescue_action_in_public?
+      end
+      
+      def rescue_action_with_handler_with_fast_errors(exception)
+        if (use_rails_error_handling? || rescue_action_in_public?) & !handler_for_rescue(exception)
+          rescue_action_in_public(exception)
         else
-          raise exception
+          rescue_action_with_handler_without_fast_errors(exception)
         end
       end
+      alias_method_chain :rescue_action_with_handler, :fast_errors
     end
-    alias_method_chain :rescue_action, :fast_errors
 
   end
 end

data/lib/spec/rails/extensions/action_controller/test_case.rb

@@ -0,0 +1,14 @@
+module ActionController
+  class TestCase
+    if Rails::VERSION::STRING =~ /2\.0/
+      # Introduced in Rails 2.1, but we need it for 2.0
+      def rescue_action_in_public!
+        # See rescue.rb in this same directory
+        def request.rescue_action_in_public?
+          true
+        end
+      end
+      
+    end
+  end
+end

data/lib/spec/rails/extensions/action_controller/test_response.rb

@@ -9,9 +9,10 @@ module ActionController #:nodoc:
     if ::Rails::VERSION::STRING < "2.3"
       def [](name)
         Kernel.warn <<-WARNING
-[](name) as an alias for capture(name) (TestResponse extension in rspec-rails)
-is deprecated and will be removed in the rspec-rails release that follows the
-rails-2.3.0 release.
+DEPRECATION NOTICE: [](name) as an alias for capture(name) (TestResponse
+extension in rspec-rails) is deprecated and will not be defined by rspec-rails
+when working with rails >= 2.3.0. It will also be removed entirely from
+a future version of rspec-rails.
 WARNING
         capture(name)
       end

data/lib/spec/rails/extensions/action_view/base.rb

@@ -3,8 +3,7 @@ module ActionView #:nodoc:
     include Spec::Rails::Example::RenderObserver
     cattr_accessor :base_view_path
 
-    alias_method :orig_render_partial, :render_partial
-    def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
+    def render_partial_with_base_view_path_handling(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
       if partial_path.is_a?(String)
         unless partial_path.include?("/")
           unless self.class.base_view_path.nil?
@@ -13,21 +12,22 @@ module ActionView #:nodoc:
         end
       end
       begin
-        orig_render_partial(partial_path, local_assigns, deprecated_local_assigns)
+        render_partial_without_base_view_path_handling(partial_path, local_assigns, deprecated_local_assigns)
       rescue ArgumentError # edge rails > 2.1 changed render_partial to accept only one arg
-        orig_render_partial(partial_path)
+        render_partial_without_base_view_path_handling(partial_path)
       end
     end
+    alias_method_chain :render_partial, :base_view_path_handling
 
-    alias_method :orig_render, :render
-    def render(options = {}, old_local_assigns = {}, &block)
-      if render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+    def render_with_mock_proxy(options = {}, old_local_assigns = {}, &block)
+      if render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
         render_proxy.render(options)
       else
-        unless render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
-          orig_render(options, old_local_assigns, &block)
+        unless render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)
+          render_without_mock_proxy(options, old_local_assigns, &block)
         end
       end
     end
+    alias_method_chain :render, :mock_proxy
   end
 end

data/lib/spec/rails/extensions/active_record/base.rb

@@ -1,29 +1,45 @@
 if defined?(ActiveRecord::Base)
-  module ActiveRecord #:nodoc:
-    class Base
-      class << self
-        # Extension for <tt>should have</tt> on AR Model classes
-        #
-        #   ModelClass.should have(:no).records
-        #   ModelClass.should have(1).record
-        #   ModelClass.should have(n).records
-        def records
-          find(:all)
-        end
-        alias :record :records
-      end
+  module Spec
+    module Rails
+      module Extensions
+        module ActiveRecord
+          module ClassMethods
+            # :call-seq:
+            #   ModelClass.should have(:no).records
+            #   ModelClass.should have(1).record
+            #   ModelClass.should have(n).records
+            #
+            # Extension to enhance <tt>should have</tt> on AR Model classes
+            def records
+              find(:all)
+            end
+            alias :record :records
+          end
 
-      # Extension for <tt>should have</tt> on AR Model instances
-      #
-      #   model.should have(:no).errors_on(:attribute)
-      #   model.should have(1).error_on(:attribute)
-      #   model.should have(n).errors_on(:attribute)
-      def errors_on(attribute)
-        self.valid?
-        [self.errors.on(attribute)].flatten.compact
+          module InstanceMethods
+            # :call-seq:
+            #   model.should have(:no).errors_on(:attribute)
+            #   model.should have(1).error_on(:attribute)
+            #   model.should have(n).errors_on(:attribute)
+            #
+            # Extension to enhance <tt>should have</tt> on AR Model instances.
+            # Calls model.valid? in order to prepare the object's errors
+            # object.
+            def errors_on(attribute)
+              self.valid?
+              [self.errors.on(attribute)].flatten.compact
+            end
+            alias :error_on :errors_on
+          end
+        end
       end
-      alias :error_on :errors_on
-
+    end
+  end
+  
+  module ActiveRecord #:nodoc:
+    class Base
+      extend  Spec::Rails::Extensions::ActiveRecord::ClassMethods
+      include Spec::Rails::Extensions::ActiveRecord::InstanceMethods
     end
   end
 end

data/lib/spec/rails/extensions/spec/matchers/have.rb

@@ -3,19 +3,21 @@ require 'spec/matchers/have'
 module Spec #:nodoc:
   module Matchers #:nodoc:
     class Have #:nodoc:
-      alias_method :__original_failure_message, :failure_message
-      def failure_message
+
+      def failure_message_with_errors_on_extensions
         return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@given}" if @collection_name == :errors_on
         return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@given}" if @collection_name == :error_on
-        return __original_failure_message
+        return failure_message_without_errors_on_extensions
       end
+      alias_method_chain :failure_message, :errors_on_extensions
       
-      alias_method :__original_description, :description
-      def description
+      def description_with_errors_on_extensions
         return "should have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
         return "should have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}" if @collection_name == :error_on
-        return __original_description
+        return description_without_errors_on_extensions
       end
+      alias_method_chain :description, :errors_on_extensions
+
     end
   end
 end

data/lib/spec/rails/extensions.rb

@@ -6,5 +6,6 @@ require 'spec/rails/extensions/spec/matchers/have'
 require 'spec/rails/extensions/active_support/test_case'
 require 'spec/rails/extensions/active_record/base'
 require 'spec/rails/extensions/action_controller/rescue'
+require 'spec/rails/extensions/action_controller/test_case'
 require 'spec/rails/extensions/action_controller/test_response'
 require 'spec/rails/extensions/action_view/base'

data/lib/spec/rails/matchers/ar_be_valid.rb

@@ -6,7 +6,7 @@ module Spec
         
         def initialize
           @matcher = Spec::Matchers::Be.new :be_valid
-          @matcher.send :handling_predicate!
+          @matcher.__send__ :handling_predicate!
         end
 
         def matches?(actual)

data/lib/spec/rails/matchers/assert_select.rb

@@ -24,7 +24,7 @@ module Spec # :nodoc:
           end
           @block = block if block
           begin
-            @spec_scope.send(@assertion, *@args, &@block)
+            @spec_scope.__send__(@assertion, *@args, &@block)
           rescue ::Test::Unit::AssertionFailedError => @error
           end
           

data/lib/spec/rails/mocks.rb

@@ -17,7 +17,7 @@ module Spec
           :errors => stub("errors", :count => 0)
         })
         m = mock("#{model_class.name}_#{id}", options_and_stubs)
-        m.send(:__mock_proxy).instance_eval <<-CODE
+        m.__send__(:__mock_proxy).instance_eval <<-CODE
           def @target.as_new_record
             self.stub!(:id).and_return nil
             self.stub!(:to_param).and_return nil

data/lib/spec/rails/story_adapter.rb

@@ -14,8 +14,8 @@ require 'spec/rails'
 
 Test::Unit.run = true
 
-ActionController::Integration::Session.send(:include, Spec::Matchers)
-ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)
+ActionController::Integration::Session.__send__ :include, Spec::Matchers
+ActionController::Integration::Session.__send__ :include, Spec::Rails::Matchers
 
 class RailsStory < ActionController::IntegrationTest
   if defined?(ActiveRecord::Base)
@@ -43,7 +43,7 @@ class ActiveRecordSafetyListener
       if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
         ActiveRecord::Base.connection.increment_open_transactions
       else
-        ActiveRecord::Base.send :increment_open_transactions
+        ActiveRecord::Base.__send__ :increment_open_transactions
       end
     end
     ActiveRecord::Base.connection.begin_db_transaction
@@ -55,7 +55,7 @@ class ActiveRecordSafetyListener
       if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
         ActiveRecord::Base.connection.decrement_open_transactions
       else
-        ActiveRecord::Base.send :decrement_open_transactions
+        ActiveRecord::Base.__send__ :decrement_open_transactions
       end
     end
   end

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 99
-        MINESCULE = 5
+        MINESCULE = 6
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -2,38 +2,38 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.99.5"
+  s.version = "1.1.99.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-02-12}
+  s.date = %q{2009-02-15}
   s.description = %q{Behaviour Driven Development for Ruby on Rails.}
   s.email = ["rspec-devel@rubyforge.org"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "TODO.txt", "Upgrade.txt", "generators/rspec/templates/previous_failures.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO.txt", "Upgrade.txt", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/routing_helpers.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/active_support/test_case.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/spec_server.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.html.erb", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_example_group_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_example_group_spec.rb", "spec/spec/rails/example/model_example_group_spec.rb", "spec/spec/rails/example/shared_behaviour_spec.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_example_group_spec.rb", "spec/spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "spec/spec_helper.rb"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO.txt", "Upgrade.markdown", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/routing_helpers.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_case.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/active_support/test_case.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/spec_server.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.html.erb", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_example_group_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/error_handling_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_example_group_spec.rb", "spec/spec/rails/example/model_example_group_spec.rb", "spec/spec/rails/example/shared_behaviour_spec.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_example_group_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://rspec.info/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.99.5}
+  s.summary = %q{rspec-rails 1.1.99.6}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.5"])
+      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
       s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
-      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.5"])
+      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.5"])
+    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

data/spec/resources/controllers/controller_spec_controller.rb

@@ -104,7 +104,7 @@ class ControllerSpecController < ActionController::Base
     raise RescuedError
   end
 
-  def other_error_action
+  def un_rescued_error_action
     raise UnRescuedError
   end
 end

data/spec/spec/rails/example/controller_example_group_spec.rb

@@ -158,57 +158,6 @@ require 'controller_spec_controller'
     
     end
     
-    describe "with an error that is not rescued in the controller" do
-      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
-          pending "deal with use_rails_error_handling" do
-            controller.use_rails_error_handling!
-            lambda do
-              get 'other_error_action'
-            end.should_not raise_error
-          end
-        end
-      end
-    end
-    
-    describe "with an error that is rescued in the controller" 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'
-          response.body.should == 'Rescued!'
-        end
-      end
-
-      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
-
     class CustomRouteSpecController < ActionController::Base; end
     class RspecOnRailsSpecsController < ActionController::Base; end
 

data/spec/spec/rails/example/error_handling_spec.rb

@@ -0,0 +1,90 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'controller_spec_controller'
+
+['integration', 'isolation'].each do |mode|
+  describe "A controller example running in #{mode} mode", :type => :controller do
+    controller_name :controller_spec
+    integrate_views if mode == 'integration'
+    
+    describe "without use_rails_error_handling!" do
+      describe "with an error that is *not* rescued" do
+        it "raises the error" do
+          lambda do
+            get 'un_rescued_error_action'
+          end.should raise_error(ControllerSpecController::UnRescuedError)
+        end
+      end
+      describe "with an error that *is* rescued" do
+        it "returns a 200" do
+          get 'rescued_error_action'
+          response.response_code.should == 200
+        end
+      end
+    end
+
+    describe "with deprecated use_rails_error_handling!" do
+      before(:each) do
+        Kernel.stub!(:warn)
+      end
+
+      it "warns of deprecation" do
+        Kernel.should_receive(:warn).with(/DEPRECATION NOTICE/)
+        controller.use_rails_error_handling!
+      end
+
+      describe "with an error that is *not* rescued" do
+        it "returns the error code" do
+          controller.use_rails_error_handling!
+          get 'un_rescued_error_action'
+          response.response_code.should == 500
+        end
+      end
+
+      describe "with an error that *is* rescued" do
+        it "returns a 200" do
+          controller.use_rails_error_handling!
+          get 'rescued_error_action'
+          response.response_code.should == 200
+        end
+      end
+    end
+
+    describe "with rescue_action_in_public!" do
+      describe "with an error that is *not* rescued" do
+        it "returns the error code" do
+          rescue_action_in_public!
+          get 'un_rescued_error_action'
+          response.response_code.should == 500
+        end
+      end
+
+      describe "with an error that *is* rescued" do
+        it "returns a 200" do
+          rescue_action_in_public!
+          get 'rescued_error_action'
+          response.response_code.should == 200
+        end
+      end
+    end
+    
+    describe "with bypass_rescue" do
+      describe "with an error that is *not* rescued" do
+        it "raises the error" do
+          bypass_rescue
+          lambda do
+            get 'un_rescued_error_action'
+          end.should raise_error(ControllerSpecController::UnRescuedError)
+        end
+      end
+
+      describe "with an error that *is* rescued" do
+        it "raises the error" do
+          bypass_rescue
+          lambda do
+            get 'rescued_error_action'
+          end.should raise_error(ControllerSpecController::RescuedError)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.5
+  version: 1.1.99.6
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,20 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dchelimsky-rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.5
+        version: 1.1.99.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.13
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.3
+    version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
 - rspec-devel@rubyforge.org
@@ -43,7 +65,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - TODO.txt
-- Upgrade.txt
 - generators/rspec/templates/previous_failures.txt
 files: 
 - History.txt
@@ -52,7 +73,7 @@ files:
 - README.txt
 - Rakefile
 - TODO.txt
-- Upgrade.txt
+- Upgrade.markdown
 - features/step_definitions/people.rb
 - features/support/env.rb
 - features/transactions/transactions_should_rollback.feature
@@ -99,6 +120,7 @@ files:
 - lib/spec/rails/example/view_example_group.rb
 - lib/spec/rails/extensions.rb
 - lib/spec/rails/extensions/action_controller/rescue.rb
+- lib/spec/rails/extensions/action_controller/test_case.rb
 - lib/spec/rails/extensions/action_controller/test_response.rb
 - lib/spec/rails/extensions/action_view/base.rb
 - lib/spec/rails/extensions/active_record/base.rb
@@ -183,13 +205,13 @@ files:
 - spec/spec/rails/example/controller_example_group_spec.rb
 - spec/spec/rails/example/controller_isolation_spec.rb
 - spec/spec/rails/example/cookies_proxy_spec.rb
+- spec/spec/rails/example/error_handling_spec.rb
 - spec/spec/rails/example/example_group_factory_spec.rb
 - spec/spec/rails/example/helper_example_group_spec.rb
 - spec/spec/rails/example/model_example_group_spec.rb
 - spec/spec/rails/example/shared_behaviour_spec.rb
 - spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
 - spec/spec/rails/example/view_example_group_spec.rb
-- spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
 - spec/spec/rails/extensions/action_view_base_spec.rb
 - spec/spec/rails/extensions/active_record_spec.rb
 - spec/spec/rails/interop/testcase_spec.rb
@@ -235,6 +257,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.5
+summary: rspec-rails 1.1.99.6
 test_files: []
 

data/Upgrade.txt

@@ -1,37 +0,0 @@
-=== Upgrade to rspec-rails-1.1.99.4
-
-== update generated files
-
-Be sure to run "script/generate rspec" and allow the following files to be overwritten:
-
-* lib/tasks/rspec.rake
-* script/spec_server
-
-== route_for
-
-After a change to edge rails broke our monkey-patched #route_for method, I
-decided to just delegate to rails' #assert_generates method. For most cases,
-this will not present a problem, but for some it might. You'll know if you
-upgrade and see any newly failing, route-related examples. Here are the things
-that you might need to change.
-
-* Make sure IDs are strings
-
-If you had :id => 1 before, you need to change that to :id => "1"
-
-  #old
-  route_for(:controller => 'things', :action => 'show', :id => 1).should == "/things/1"
-  
-  #new
-  route_for(:controller => 'things', :action => 'show', :id => "1").should == "/things/1"
-  
-* Convert paths for non-get methods to hashes
-
-If you had an example with a route that requires post, put, or delete, you'll
-need to declare that explicitly.
-
-  #old
-  route_for(:controller => 'things', :action => 'create').should == "/things"
-  
-  #new
-  route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}

data/spec/spec/rails/extensions/action_controller_rescue_action_spec.rb

@@ -1,57 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-module ActionController
-  describe "Rescue", "#rescue_action in default mode" do
-    before(:each) do
-      @fixture = Object.new
-      @fixture.extend ActionController::Rescue
-      def @fixture.rescue_with_handler(exception)
-        false
-      end
-      class << @fixture
-        public :rescue_action
-      end
-    end
-
-    it "should raise the passed in exception so examples fail fast" do
-      proc {@fixture.rescue_action(RuntimeError.new("Foobar"))}.should raise_error(RuntimeError, "Foobar")
-    end
-  end
-
-  class RescueOverriddenController < ActionController::Base
-    def rescue_action(error)
-      "successfully overridden"
-    end
-  end
-
-  describe "Rescue", "#rescue_action, when overridden" do
-    before(:each) do
-      @fixture = RescueOverriddenController.new
-    end
-
-    it "should do whatever the overridden method does" do
-      @fixture.rescue_action(RuntimeError.new("Foobar")).should == "successfully overridden"
-    end
-  end
-
-  class SearchController < ActionController::Base
-  end
-
-  describe "Rescue", "#rescue_action when told to use rails error handling" do
-    before(:each) do
-      @controller = SearchController.new
-      @controller.use_rails_error_handling!
-      class << @controller
-        public :rescue_action
-      end
-    end
-
-    it "should use Rails exception handling" do
-      exception = RuntimeError.new("The Error")
-      exception.stub!(:backtrace).and_return(caller)
-      @controller.should_receive(:rescue_action_locally).with(exception)
-
-      @controller.rescue_action(exception)
-    end
-  end
-end