rspec-rails 1.1.11 → 1.1.12

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

@@ -2,7 +2,7 @@ module ActionController
   class Base
     class << self
       def set_view_path(path)
-        [:append_view_path, :view_paths=, :template_root=].each do |method|
+        [:append_view_path, :template_root=].each do |method|
           if respond_to?(method)
             return send(method, path)
           end

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

@@ -8,14 +8,18 @@ module ActionController
       @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 respond_to?(:rescue_with_handler) and 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

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

@@ -5,7 +5,16 @@ module ActionController #:nodoc:
     def capture(name)
       template.instance_variable_get "@content_for_#{name.to_s}"
     end
-    alias [] capture
-
+    
+    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.
+WARNING
+        capture(name)
+      end
+    end
   end
 end

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

@@ -2,6 +2,8 @@ module ActionView #:nodoc:
   class Base #: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:
       if partial_path.is_a?(String)
         unless partial_path.include?("/")
@@ -11,9 +13,9 @@ module ActionView #:nodoc:
         end
       end
       begin
-        super(partial_path, local_assigns, deprecated_local_assigns)
+        orig_render_partial(partial_path, local_assigns, deprecated_local_assigns)
       rescue ArgumentError # edge rails > 2.1 changed render_partial to accept only one arg
-        super(partial_path)
+        orig_render_partial(partial_path)
       end
     end
 

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

@@ -1,8 +1,7 @@
 if defined?(ActiveRecord::Base)
   module ActiveRecord #:nodoc:
     class Base
-
-      (class << self; self; end).class_eval do
+      class << self
         # Extension for <tt>should have</tt> on AR Model classes
         #
         #   ModelClass.should have(:no).records

data/lib/spec/rails/extensions/spec/{example → runner}/configuration.rb

@@ -1,8 +1,13 @@
-require 'spec/example/configuration'
+require 'spec/runner/configuration'
+require 'test_help'
+
 begin
 module Spec
-  module Example
+  module Runner
     class Configuration
+      
+      TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase
+      
       # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is
       # created. This causes an ordering issue when setting state on Configuration because the data is
       # already copied.
@@ -10,7 +15,7 @@ module Spec
       # @inheritable_attributes updated.
       # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality
       EXAMPLE_GROUP_CLASSES = [
-        ::Test::Unit::TestCase,
+        TEST_CASE,
         ::Spec::Rails::Example::RailsExampleGroup,
         ::Spec::Rails::Example::FunctionalExampleGroup,
         ::Spec::Rails::Example::ControllerExampleGroup,
@@ -26,7 +31,7 @@ module Spec
         end
 
         def use_transactional_fixtures
-          Test::Unit::TestCase.use_transactional_fixtures
+          TEST_CASE.use_transactional_fixtures
         end
         def use_transactional_fixtures=(value)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -35,7 +40,7 @@ module Spec
         end
 
         def use_instantiated_fixtures
-          Test::Unit::TestCase.use_instantiated_fixtures
+          TEST_CASE.use_instantiated_fixtures
         end
         def use_instantiated_fixtures=(value)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -44,7 +49,7 @@ module Spec
         end
 
         def fixture_path
-          Test::Unit::TestCase.fixture_path
+          TEST_CASE.fixture_path
         end
         def fixture_path=(path)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -53,7 +58,7 @@ module Spec
         end
 
         def global_fixtures
-          ::Test::Unit::TestCase.fixture_table_names
+          TEST_CASE.fixture_table_names
         end
         def global_fixtures=(fixtures)
           EXAMPLE_GROUP_CLASSES.each do |example_group|

data/lib/spec/rails/matchers.rb

@@ -1,4 +1,5 @@
 dir = File.dirname(__FILE__)
+require 'spec/rails/matchers/ar_be_valid'
 require 'spec/rails/matchers/assert_select'
 require 'spec/rails/matchers/change'
 require 'spec/rails/matchers/have_text'

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

@@ -0,0 +1,41 @@
+module Spec
+  module Rails
+    module Matchers
+    
+      class ArBeValid  #:nodoc:
+        
+        def initialize
+          @matcher = Spec::Matchers::Be.new :be_valid
+          @matcher.send :handling_predicate!
+        end
+
+        def matches?(actual)
+          @actual = actual
+          @matcher.matches? @actual
+        end
+      
+        def failure_message
+          if @actual.respond_to?(:errors) &&
+              ActiveRecord::Errors === @actual.errors
+            "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ")            
+          else
+            @matcher.failure_message
+          end
+        end
+        
+        def negative_failure_message
+          @matcher.negative_failure_message
+        end
+        
+      end
+
+      # :call-seq:
+      #   response.should be_valid
+      #   response.should_not be_valid
+      def be_valid
+        ArBeValid.new
+      end
+    
+    end
+  end
+end

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

@@ -40,7 +40,7 @@ module Spec
 
         def path_hash(url)
           path = url.sub(%r{^\w+://#{@request.host}(?::\d+)?}, "").split("?", 2)[0]
-          ActionController::Routing::Routes.recognize_path path
+          ActionController::Routing::Routes.recognize_path path, { :method => :get }
         end
 
         def query_hash(url)
@@ -74,13 +74,15 @@ module Spec
         end
 
         def description
-          "redirect to #{@actual.inspect}"
+          "redirect to #{@expected.inspect}"
         end
 
         class QueryParameterParser
           def self.parse_query_parameters(query, request)
             if defined?(CGIMethods)
               CGIMethods.parse_query_parameters(query)
+            elsif defined?(ActionController::RequestParser)
+              ActionController::RequestParser.parse_query_parameters(query)
             else
               request.class.parse_query_parameters(query)
             end

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

@@ -10,9 +10,19 @@ module Spec
         end
       
         def matches?(response)
-          
           if response.respond_to?(:rendered_file)
             @actual = response.rendered_file
+          elsif response.respond_to?(:rendered)
+            case template = response.rendered[:template]
+            when nil
+              unless response.rendered[:partials].empty?
+                @actual = path_and_file(response.rendered[:partials].keys.first).join("/_")
+              end
+            when ActionView::Template
+              @actual = template.path
+            when String
+              @actual = template
+            end
           else
             @actual = response.rendered_template.to_s
           end
@@ -53,16 +63,25 @@ module Spec
           end
         
       end
-
+      
       # :call-seq:
-      #   response.should render_template(path)
-      #   response.should_not render_template(path)
+      #   response.should render_template(template)
+      #   response.should_not render_template(template)
+      #
+      # For use in controller code examples (integration or isolation mode).
+      #
+      # Passes if the specified template (view file) is rendered by the
+      # response. This file can be any view file, including a partial. However
+      # if it is a partial it must be rendered directly i.e. you can't detect
+      # that a partial has been rendered as part of a view using
+      # render_template. For that you should use a message expectation
+      # (mock) instead:
       #
-      # Passes if the specified template is rendered by the response.
-      # Useful in controller specs (integration or isolation mode).
+      #   controller.should_receive(:render).with(:partial => 'path/to/partial')
       #
-      # <code>path</code> can include the controller path or not. It
-      # can also include an optional extension (no extension assumes .rhtml).
+      # <code>template</code> can include the controller path. It can also
+      # include an optional extension, which you only need to use when there
+      # is ambiguity.
       #
       # Note that partials must be spelled with the preceding underscore.
       #
@@ -72,12 +91,13 @@ module Spec
       #   response.should render_template('same_controller/list')
       #   response.should render_template('other_controller/list')
       #
-      #   #rjs
+      #   # with extensions
       #   response.should render_template('list.rjs')
+      #   response.should render_template('list.haml')
       #   response.should render_template('same_controller/list.rjs')
       #   response.should render_template('other_controller/list.rjs')
       #
-      #   #partials
+      #   # partials
       #   response.should render_template('_a_partial')
       #   response.should render_template('same_controller/_a_partial')
       #   response.should render_template('other_controller/_a_partial')

data/lib/spec/rails/mocks.rb

@@ -104,21 +104,24 @@ module Spec
               model[k] = stubs.delete(k)
             end
           end
-          add_stubs(model, stubs)
+          model.stub!(stubs)
           yield model if block_given?
         end
       end
       
-      #--
-      # TODO - Shouldn't this just be an extension of stub! ??
-      # - object.stub!(:method => return_value, :method2 => return_value2, :etc => etc)
-      #++
+      # DEPRECATED - use object.stub!(:method => value, :method2 => value)
+      #
       # Stubs methods on +object+ (if +object+ is a symbol or string a new mock
       # with that name will be created). +stubs+ is a Hash of +method=>value+
       def add_stubs(object, stubs = {}) #:nodoc:
-        m = [String, Symbol].index(object.class) ? mock(object.to_s) : object
-        stubs.each {|k,v| m.stub!(k).and_return(v)}
-        m
+        Kernel.warn <<-WARNING
+DEPRECATION NOTICE: add_stubs is deprecated and will be removed
+from a future version of rspec-rails. Use this instead:
+  
+  object.stub!(:method => value, :method2 => value)
+  
+WARNING
+        object.stub!(stubs)
       end
 
       private

data/lib/spec/rails/version.rb

@@ -4,9 +4,10 @@ module Spec
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 1
-        TINY   = 11
+        TINY   = 12
+        MINESCULE = nil
 
-        STRING = [MAJOR, MINOR, TINY].join('.')
+        STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
 
         SUMMARY = "rspec-rails #{STRING}"
       end

data/rspec-rails.gemspec

@@ -2,27 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11"
+  s.version = "1.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-10-24}
+  s.date = %q{2009-01-11}
   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", "generators/rspec/templates/previous_failures.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "UPGRADE", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/all_stories.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/templates/stories_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/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.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/object.rb", "lib/spec/rails/extensions/spec/example/configuration.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.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/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/rails/autotest/mappings_spec.rb", "spec/rails/example/assigns_hash_proxy_spec.rb", "spec/rails/example/configuration_spec.rb", "spec/rails/example/controller_isolation_spec.rb", "spec/rails/example/controller_spec_spec.rb", "spec/rails/example/cookies_proxy_spec.rb", "spec/rails/example/example_group_factory_spec.rb", "spec/rails/example/helper_spec_spec.rb", "spec/rails/example/model_spec_spec.rb", "spec/rails/example/shared_behaviour_spec.rb", "spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/rails/example/view_spec_spec.rb", "spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/rails/extensions/action_view_base_spec.rb", "spec/rails/extensions/active_record_spec.rb", "spec/rails/interop/testcase_spec.rb", "spec/rails/matchers/assert_select_spec.rb", "spec/rails/matchers/description_generation_spec.rb", "spec/rails/matchers/errors_on_spec.rb", "spec/rails/matchers/have_text_spec.rb", "spec/rails/matchers/include_text_spec.rb", "spec/rails/matchers/redirect_to_spec.rb", "spec/rails/matchers/render_template_spec.rb", "spec/rails/matchers/should_change_spec.rb", "spec/rails/mocks/ar_classes.rb", "spec/rails/mocks/mock_model_spec.rb", "spec/rails/mocks/stub_model_spec.rb", "spec/rails/sample_modified_fixture.rb", "spec/rails/sample_spec.rb", "spec/rails/spec_server_spec.rb", "spec/rails/spec_spec.rb", "spec/rails_suite.rb", "spec/spec_helper.rb", "spec_resources/controllers/action_view_base_spec_controller.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/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.js.rjs", "spec_resources/views/render_spec/some_action.rhtml", "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/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", "stories/all.rb", "stories/configuration/stories.rb", "stories/helper.rb", "stories/steps/people.rb", "stories/transactions_should_rollback", "stories/transactions_should_rollback.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", "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/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.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/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/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_isolation_spec.rb", "spec/spec/rails/example/controller_spec_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_spec_spec.rb", "spec/spec/rails/example/model_spec_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_spec_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.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.0}
-  s.summary = %q{rspec-rails 1.1.11}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{rspec-rails 1.1.12}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
-  end
 
-  s.add_dependency(%q<rspec>, ["= 1.1.11"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.12"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
+    else
+      s.add_dependency(%q<rspec>, ["= 1.1.12"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["= 1.1.12"])
+  end
 end

data/spec/{rails/autotest → autotest}/mappings_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.join(File.dirname(__FILE__), *%w[.. .. .. lib autotest rails_rspec])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest autotest_matchers])
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../lib/autotest/rails_rspec'
+require File.dirname(__FILE__) + '/../../../rspec/spec/autotest/autotest_matchers'
 
 describe Autotest::RailsRspec, "file mapping" do
   before(:each) do

data/spec/resources/controllers/application.rb

@@ -0,0 +1,9 @@
+class ApplicationController < ActionController::Base
+  before_filter :i_should_only_be_run_once, 
+                :only => 'action_with_inherited_before_filter'
+  
+  def i_should_only_be_run_once
+    true
+  end
+  private :i_should_only_be_run_once
+end

data/{spec_resources → spec/resources}/controllers/controller_spec_controller.rb

@@ -6,12 +6,8 @@ class ControllerSpecController < ActionController::Base
   end
   
   skip_before_filter :raise_error
-  
-  if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
-    set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
-  else
-    set_view_path File.join(File.dirname(__FILE__), "..", "views")
-  end
+
+  set_view_path File.join(File.dirname(__FILE__), "..", "views")
   
   def some_action
     render :template => "template/that/does/not/actually/exist"
@@ -90,6 +86,23 @@ class ControllerSpecController < ActionController::Base
     @a_variable = false
     render :text => ""
   end
+  
+  class RescuedError < Exception; end
+  class UnRescuedError < Exception; end
+  
+  if Rails::VERSION::MAJOR >= 2
+    rescue_from RescuedError do |e|
+      render :text => 'Rescued!'
+    end
+  end
+
+  def rescued_error_action
+    raise RescuedError
+  end
+
+  def other_error_action
+    raise UnRescuedError
+  end
 end
 
 class ControllerInheritingFromApplicationControllerController < ApplicationController

data/{spec_resources → spec/resources}/controllers/redirect_spec_controller.rb

@@ -55,5 +55,12 @@ class RedirectSpecController < ApplicationController
     redirect_to :controller => "nonexistant", :action => "none"
   end
 
+  def action_with_method_restriction
+    render :text => ''
+  end
+
+  def action_to_redirect_to_action_with_method_restriction
+    redirect_to :action => 'action_with_method_restriction'
+  end
 end