dchelimsky-rspec-rails 1.1.99.9 → 1.1.99.13

data/.document

@@ -0,0 +1,7 @@
+lib/**/*.rb
+History.txt
+License.txt
+README.txt
+Upgrade.markdown
+features/**/*.feature
+

data/History.txt

@@ -49,6 +49,9 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * force cache_classes = false when running with spec_server. Closes #287.
   * keep spec_server working against edge rails (Jonathan Tron). Closes #685.
   * create lib/tasks if not present when running script/generate rspec. Closes #687.
+  * fixed regression (and added spec so it won't regress again) where
+    render => :inline didn't render unless integrate_views was set
+  * fixed nil.with_output_buffer bug in helper specs. Closes #719.
 
 === Version 1.1.12 / 2009-01-11
 

data/Manifest.txt

@@ -1,3 +1,4 @@
+.document
 History.txt
 License.txt
 Manifest.txt
@@ -47,6 +48,7 @@ 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
@@ -77,6 +79,7 @@ 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
@@ -88,49 +91,48 @@ 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/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.rhtml
-spec/resources/views/render_spec/action_with_alternate_layout.rhtml
+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/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/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.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/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
@@ -140,7 +142,8 @@ 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/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

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.9"],["rack",">=0.4.0"]]
+  p.extra_deps = [["dchelimsky-rspec","1.1.99.13"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
@@ -55,9 +55,4 @@ namespace :update do
   task :manifest do
     system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
   end
-  
-  desc "update the gemspec"
-  task :gemspec do
-    system %q[rake debug_gem | grep -v "(in " | grep -v "s.add_dependency(%q<hoe" | grep -v "s.add_dependency(%q<cuc" > `basename \\`pwd\\``.gemspec]
-  end
 end

data/Upgrade.markdown

@@ -1,15 +1,17 @@
-# Upgrade to rspec-rails-1.1.99.x
+# Upgrade to rspec-rails-1.1.99.x (pre rspec-rails-1.2)
 
-## Supported Rails Versions
+## What's changed
+
+### Supported Rails Versions
 
 This release supports the following versions of rails:
 
 * 2.0.5
 * 2.1.2
 * 2.2.2
-* 2.3.0
+* 2.3.1
 
-## update generated files
+### update generated files
 
 Be sure to run "script/generate rspec" and allow the following files to be overwritten:
 
@@ -17,36 +19,85 @@ Be sure to run "script/generate rspec" and allow the following files to be overw
 * script/spec
 * script/spec_server
 
-## controller.use\_rails\_error\_handling! is deprecated
+### ``controller.use_rails_error_handling!`` is deprecated
 
-Use rescue\_action\_in\_public! instead. It comes directly from rails and does
+Use ``rescue_action_in_public!`` instead. It comes directly from rails and does
 exactly the same thing
 
-## route_for
+### 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,
+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
+#### 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"
+    #old
+    route_for(:controller => 'things', :action => 'show', :id => 1).should == "/things/1"
   
-	  #new
-	  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
+#### 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"
+    #old
+    route_for(:controller => 'things', :action => 'create').should == "/things"
+  
+    #new
+    route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}
   
-	  #new
-	  route_for(:controller => 'things', :action => 'create').should == {:path => "/things", :method => :post}
+### Controller/template isolation
+
+Even though controller specs do not render views by default (use
+``integrate_views`` to get them to render views), the way this works has
+changed in this version.
+
+It used to be that the view template need not even exist, but due to changes
+in rails it became much more difficult to manage that for all the different
+versions of rails that rspec-rails supports. So now the template must exist,
+but it still won't be rendered unless you declare ``integrate_views``.
+
+## What's new
+
+### render no longer requires a path
+
+The ``render()`` method in view specs will infer the path from the
+first argument passed to ``describe()``.
+
+    describe "players/show" do
+      it "does something" do
+        render
+        response.should have_tag("....")
+      end
+    end
+    
+### routing specs live in spec/routing
+
+``script/generate rspec_scaffold`` now generates its routing spec in
+``spec/routing/``.
+
+### bypass_rescue
+
+Added a new ``bypass_rescue()`` declaration for controller specs. Use this
+when you want to specify that an error is raised by an action, even if that
+error is later captured by a ``rescue_from()`` declaration.
+
+    describe AccountController do
+      describe "GET @account" do
+        context "requested by anonymous user" do
+          it "denies access" do
+            bypass_rescue
+            lambda do
+              get :show, :id => "37"
+            end.should raise_error(AccessDenied)
+          end
+        end
+      end
+    end

data/generators/rspec/templates/rspec.rake

@@ -112,11 +112,13 @@ namespace :spec do
     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
     ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
     ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/lib) if File.exist?('spec/routing')
     ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
     ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
     ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
     ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
     ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
     ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
   end
 
@@ -136,7 +138,7 @@ namespace :spec do
   end
 
   namespace :server do
-    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/spec_server.pid")
+    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid")
     
     desc "start spec_server."
     task :start do
@@ -144,7 +146,7 @@ namespace :spec do
         $stderr.puts "spec_server is already running."
       else
         $stderr.puts %Q{Starting up spec_server ...}
-        FileUtils.mkdir('tmp') unless test ?d, 'tmp'
+        FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids'
         system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
       end
     end

data/generators/rspec/templates/script/spec

@@ -1,4 +1,21 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
-require 'spec'
+rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
+rspec_gem_dir = nil
+Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
+  rspec_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
+end
+rspec_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec")
+
+if rspec_gem_dir && (test ?d, rspec_plugin_dir)
+  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
+end
+
+if rspec_gem_dir
+  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
+elsif File.exist?(rspec_plugin_dir)
+  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
+end
+
+
+require 'spec/autorun'
 exit ::Spec::Runner::CommandLine.run

data/generators/rspec/templates/script/spec_server

@@ -1,5 +1,21 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec-rails/lib' # For rspec installed as plugin
+rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
+rspec_rails_gem_dir = nil
+Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
+  rspec_rails_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-rails-(\d+)/
+end
+rspec_rails_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec-rails")
+
+if rspec_rails_gem_dir && (test ?d, rspec_rails_plugin_dir)
+  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
+end
+
+if rspec_rails_gem_dir
+  $LOAD_PATH.unshift("#{rspec_rails_gem_dir}/lib") 
+elsif File.exist?(rspec_rails_plugin_dir)
+  $LOAD_PATH.unshift("#{rspec_rails_plugin_dir}/lib")
+end
+
 require 'optparse'
 require 'spec/rails/spec_server'
 
@@ -33,5 +49,3 @@ if options[:daemon]
 else
   ::Spec::Rails::SpecServer.run
 end
-
-puts "Ready"

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

@@ -162,6 +162,7 @@ MESSAGE
           end
           
           def render(*args)
+            return super if Hash === args.last && args.last[:inline]
             @_rendered ? record_render(args[0]) : super
           end
         
@@ -211,7 +212,7 @@ MESSAGE
           def response(&block)
             # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh?
             @update = block
-            @_response || @response
+            super
           end
 
           def integrate_views!
@@ -219,7 +220,7 @@ MESSAGE
           end
 
         private
-
+        
           def integrate_views?
             @integrate_views
           end

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

@@ -34,29 +34,15 @@ module Spec
         attr_accessor :output_buffer
         
         class HelperObject < ActionView::Base
+          def initialize(*args)
+            @template = self
+            super
+          end
           def protect_against_forgery?
             false
           end
           
-          def session=(session)
-            @session = session
-          end
-          
-          def request=(request)
-            @request = request
-          end
-          
-          def flash=(flash)
-            @flash = flash
-          end
-          
-          def params=(params)
-            @params = params
-          end
-          
-          def controller=(controller)
-            @controller = controller
-          end
+          attr_writer :session, :request, :flash, :params, :controller
           
           private
             attr_reader :session, :request, :flash, :params, :controller
@@ -113,7 +99,7 @@ module Spec
         ActionView::Base.included_modules.reverse.each do |mod|
           include mod if mod.parents.include?(ActionView::Helpers)
         end
-
+        
         before(:each) do
           @controller.request = @request
           @controller.url = ActionController::UrlRewriter.new @request, {} # url_for

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

@@ -0,0 +1,13 @@
+module Spec
+  module Rails
+    module Example
+
+      class RoutingExampleGroup < ActionController::TestCase
+        tests Class.new(ActionController::Base)
+        
+        Spec::Example::ExampleGroupFactory.register(:routing, self)
+      end
+
+    end
+  end
+end