dchelimsky-rspec-rails 1.1.99.9 → 1.1.99.13

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

@@ -4,12 +4,12 @@ module Spec #:nodoc:
   module Matchers #:nodoc:
     class Have #:nodoc:
 
-      def failure_message_with_errors_on_extensions
+      def failure_message_for_should_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 failure_message_without_errors_on_extensions
       end
-      alias_method_chain :failure_message, :errors_on_extensions
+      alias_method_chain :failure_message_for_should, :errors_on_extensions
       
       def description_with_errors_on_extensions
         return "should have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on

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

@@ -14,17 +14,17 @@ module Spec
           @matcher.matches? @actual
         end
       
-        def failure_message
+        def failure_message_for_should
           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
+            @matcher.failure_message_for_should
           end
         end
         
-        def negative_failure_message
-          @matcher.negative_failure_message
+        def failure_message_for_should_not
+          @matcher.failure_message_for_should_not
         end
         
         def description

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

@@ -5,7 +5,7 @@ module Spec # :nodoc:
     module Matchers
 
       class AssertSelect #:nodoc:
-
+        
         def initialize(assertion, spec_scope, *args, &block)
           @assertion = assertion
           @spec_scope = spec_scope
@@ -14,25 +14,22 @@ module Spec # :nodoc:
         end
         
         def matches?(response_or_text, &block)
-          if ActionController::TestResponse === response_or_text and
-                   response_or_text.headers.key?('Content-Type') and
-                   !response_or_text.headers['Content-Type'].blank? and
-                   response_or_text.headers['Content-Type'].to_sym == :xml
-            @args.unshift(HTML::Document.new(response_or_text.body, false, true).root)           
-          elsif String === response_or_text
-            @args.unshift(HTML::Document.new(response_or_text).root)
-          end
           @block = block if block
+
+          if doc = doc_from(response_or_text)
+            @args.unshift(doc)
+          end
+
           begin
             @spec_scope.__send__(@assertion, *@args, &@block)
+            true
           rescue ::Test::Unit::AssertionFailedError => @error
+            false
           end
-          
-          @error.nil?
         end
-
-        def failure_message; @error.message; end
-        def negative_failure_message; "should not #{description}, but did"; end
+        
+        def failure_message_for_should; @error.message; end
+        def failure_message_for_should_not; "should not #{description}, but did"; end
 
         def description
           {
@@ -43,13 +40,31 @@ module Spec # :nodoc:
 
       private
 
+        module TestResponseOrString
+          def test_response?
+            ActionController::TestResponse === self and
+                                               !self.headers['Content-Type'].blank? and
+                                               self.headers['Content-Type'].to_sym == :xml
+          end
+        
+          def string?
+            String === self
+          end
+        end
+
+        def doc_from(response_or_text)
+          response_or_text.extend TestResponseOrString
+          markup = response_or_text.body if response_or_text.test_response?
+          markup = response_or_text if response_or_text.string?
+          HTML::Document.new(markup, false, true).root if markup
+        end
+        
         def format_args(*args)
-          return "" if args.empty?
-          return "(#{arg_list(*args)})"
+          args.empty? ? "" : "(#{arg_list(*args)})"
         end
 
         def arg_list(*args)
-          args.collect do |arg|
+          args.map do |arg|
             arg.respond_to?(:description) ? arg.description : arg.inspect
           end.join(", ")
         end
@@ -75,7 +90,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def have_tag(*args, &block)
-        AssertSelect.new(:assert_select, self, *args, &block)
+        @__current_scope_for_assert_select = AssertSelect.new(:assert_select, self, *args, &block)
       end
     
       # wrapper for a nested assert_select
@@ -86,7 +101,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def with_tag(*args, &block)
-        should have_tag(*args, &block)
+        @__current_scope_for_assert_select.should have_tag(*args, &block)
       end
     
       # wrapper for a nested assert_select with false
@@ -97,7 +112,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def without_tag(*args, &block)
-        should_not have_tag(*args, &block)
+        @__current_scope_for_assert_select.should_not have_tag(*args, &block)
       end
     
       # :call-seq:

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

@@ -14,11 +14,11 @@ module Spec
           return actual == expected unless Regexp === expected
         end
       
-        def failure_message
+        def failure_message_for_should
           "expected #{expected.inspect}, got #{actual.inspect}"
         end
         
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to have text #{expected.inspect}"
         end
         

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

@@ -13,11 +13,11 @@ module Spec
           return actual.include?(expected)
         end
 
-        def failure_message
+        def failure_message_for_should
           "expected to find #{expected.inspect} in #{actual.inspect}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to include text #{expected.inspect}"
         end
 

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

@@ -80,7 +80,7 @@ module Spec
           end
         end
 
-        def failure_message
+        def failure_message_for_should
           if @redirected
             if @status_matched
               return %Q{expected redirect to #{@expected.inspect}, got redirect to #{@actual.inspect}}
@@ -92,7 +92,7 @@ module Spec
           end
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
             return %Q{expected not to be redirected to #{@expected.inspect}, but was} if @redirected
         end
 

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

@@ -36,11 +36,11 @@ module Spec
           given_controller_path == expected_controller_path && given_file.match(expected_file)
         end
         
-        def failure_message
+        def failure_message_for_should
           "expected #{@expected.inspect}, got #{@actual.inspect}"
         end
         
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to render #{@expected.inspect}, but did"
         end
         

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 99
-        MINESCULE = 9
+        MINESCULE = 13
 
         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.9"
+  s.version = "1.1.99.13"
 
   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-24}
+  s.date = %q{2009-03-09}
   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", "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.files = [".document", "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_example_group.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/example.txt", "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.html.erb", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.html.erb", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.html.erb", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.html.erb", "spec/resources/views/controller_spec/action_with_errors_in_template.html.erb", "spec/resources/views/controller_spec/action_with_template.html.erb", "spec/resources/views/layouts/application.html.erb", "spec/resources/views/layouts/simple.html.erb", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.html.erb", "spec/resources/views/render_spec/action_with_alternate_layout.html.erb", "spec/resources/views/render_spec/some_action.html.erb", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/rjs_spec/_replacement_partial.html.erb", "spec/resources/views/rjs_spec/hide_div.js.rjs", "spec/resources/views/rjs_spec/hide_page_element.js.rjs", "spec/resources/views/rjs_spec/insert_html.js.rjs", "spec/resources/views/rjs_spec/replace.js.rjs", "spec/resources/views/rjs_spec/replace_html.js.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.js.rjs", "spec/resources/views/rjs_spec/visual_effect.js.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.js.rjs", "spec/resources/views/tag_spec/no_tags.html.erb", "spec/resources/views/tag_spec/single_div_with_no_attributes.html.erb", "spec/resources/views/tag_spec/single_div_with_one_attribute.html.erb", "spec/resources/views/view_spec/_partial.html.erb", "spec/resources/views/view_spec/_partial_used_twice.html.erb", "spec/resources/views/view_spec/_partial_with_local_variable.html.erb", "spec/resources/views/view_spec/_partial_with_sub_partial.html.erb", "spec/resources/views/view_spec/_spacer.html.erb", "spec/resources/views/view_spec/accessor.html.erb", "spec/resources/views/view_spec/block_helper.html.erb", "spec/resources/views/view_spec/entry_form.html.erb", "spec/resources/views/view_spec/explicit_helper.html.erb", "spec/resources/views/view_spec/foo/show.html.erb", "spec/resources/views/view_spec/implicit_helper.html.erb", "spec/resources/views/view_spec/multiple_helpers.html.erb", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.html.erb", "spec/resources/views/view_spec/template_with_partial.html.erb", "spec/resources/views/view_spec/template_with_partial_using_collection.html.erb", "spec/resources/views/view_spec/template_with_partial_with_array.html.erb", "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/routing_example_group_spec.rb", "spec/spec/rails/example/shared_routing_example_group_examples.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.9}
+  s.summary = %q{rspec-rails 1.1.99.13}
 
   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.9"])
+      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.13"])
       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"])
+      s.add_development_dependency(%q<hoe>, [">= 1.9.0"])
     else
-      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.9"])
+      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.13"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.9"])
+    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.13"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

data/spec/resources/controllers/controller_spec_controller.rb

@@ -82,6 +82,10 @@ class ControllerSpecController < ActionController::Base
     render :text => ""
   end
   
+  def action_that_renders_inline
+    render :inline => "<%= 'inline code' %>"
+  end
+  
   def action_that_assigns_false_to_a_variable
     @a_variable = false
     render :text => ""

data/spec/resources/controllers/example.txt

@@ -0,0 +1 @@
+This is an example file to download.

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

@@ -104,7 +104,12 @@ require File.join(File.dirname(__FILE__), "/shared_routing_example_group_example
         get 'action_which_gets_session', :expected => "session value"
       end.should_not raise_error
     end
-
+    
+    it "allows inline rendering" do
+      get 'action_that_renders_inline'
+      response.body.should == "inline code"
+    end
+    
     describe "handling should_receive(:render)" do
       it "should warn" do
         controller.should_receive(:render).with(:template => "controller_spec/action_with_template")
@@ -142,7 +147,7 @@ require File.join(File.dirname(__FILE__), "/shared_routing_example_group_example
   
       it "should support a Symbol key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        if Rails::VERSION::STRING >= "2.3"
+        if ::Rails::VERSION::STRING >= "2.3"
           cookies[:cookie_key].should == "cookie+value"
         else
           cookies[:cookie_key].should == ["cookie value"]
@@ -151,7 +156,7 @@ require File.join(File.dirname(__FILE__), "/shared_routing_example_group_example
 
       it "should support a String key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        if Rails::VERSION::STRING >= "2.3"
+        if ::Rails::VERSION::STRING >= "2.3"
           cookies['cookie_key'].should == "cookie+value"
         else
           cookies['cookie_key'].should == ["cookie value"]

data/spec/spec/rails/example/helper_example_group_spec.rb

@@ -204,3 +204,30 @@ module Spec
     end
   end
 end
+
+module Bug719
+  # see http://rspec.lighthouseapp.com/projects/5645/tickets/719
+  # FIXME - helper and example provided in ticket. The example did
+  # fail initially, so running it now shows that the bug is fixed,
+  # but this doesn't serve as a good internal example.
+  module ImagesHelper
+    def hide_images_button
+      content_tag :div, :class => :hide_images_button do
+        button_to_function "Hide Images", :id => :hide_images_button do |page|
+          page[:more_images_button].toggle
+          page[:image_browser].toggle
+        end
+      end
+    end
+  end
+  
+  describe ImagesHelper, :type => :helper do
+    it "should render a hide_images_button" do
+      helper.hide_images_button.should have_tag('div[class=?]','hide_images_button') do
+        with_tag('input[id=?][type=?][value=?][onclick^=?]',
+                 'hide_images_button', 'button', 'Hide Images',
+                 "$("more_images_button").toggle();\n$("image_browser").toggle();;")
+        end
+     end
+  end
+end

data/spec/spec/rails/example/routing_example_group_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'controller_spec_controller'
+require File.join(File.dirname(__FILE__), "/shared_routing_example_group_examples.rb")
+
+describe "Routing Examples", :type => :routing do
+  
+  include RoutingExampleGroupSpec
+
+end