dchelimsky-rspec-rails 1.1.11 → 1.1.11.1

data/History.txt

@@ -1,3 +1,13 @@
+=== Maintenance
+
+* 1 major enhancement
+
+  * support controller and action path params in view specs (Mike Vincent).
+
+* 1 minor enhancement
+
+  * improve rdoc for render_template (Patch from Andrew Premdas). Fixes #571.
+
 === Version 1.1.11 / 2008-10-24
 
 * No changes to rspec-rails - release to align with bug-fix release in rspec ... again :(

data/Manifest.txt

@@ -100,59 +100,59 @@ spec/rails/sample_spec.rb
 spec/rails/spec_server_spec.rb
 spec/rails/spec_spec.rb
 spec/rails_suite.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
 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

data/Rakefile

@@ -15,7 +15,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 = [["rspec","1.1.11"]]
+  p.extra_deps = [["rspec","1.1.11.1"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
 

data/generators/rspec/templates/rspec.rake

@@ -6,127 +6,148 @@ raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins
 # it if it is.  If not, use the gem version.
 rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib')
 $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
 
-spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
-task :noop do
-end
+begin
+  require 'spec/rake/spectask'
+  Rake.application.instance_variable_get('@tasks').delete('default')
 
-task :default => :spec
-task :stats => "spec:statsetup"
+  spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+  task :noop do
+  end
 
-desc "Run all specs in spec directory (excluding plugin specs)"
-Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
-  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+  task :default => :spec
+  task :stats => "spec:statsetup"
 
-namespace :spec do
-  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
+  desc "Run all specs in spec directory (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
     t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
     t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = lambda do
-      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-    end
-  end
-  
-  desc "Print Specdoc for all specs (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-
-  desc "Print Specdoc for all plugin specs"
-  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
   end
 
-  [:models, :controllers, :views, :helpers, :lib].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+  namespace :spec do
+    desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+    Spec::Rake::SpecTask.new(:rcov) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+      t.spec_files = FileList['spec/**/*_spec.rb']
+      t.rcov = true
+      t.rcov_opts = lambda do
+        IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+      end
     end
-  end
-  
-  desc "Run the specs under vendor/plugins (except RSpec's own)"
-  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
-    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
-  end
-  
-  namespace :plugins do
-    desc "Runs the examples for rspec_on_rails"
-    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
-      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb']
+
+    desc "Print Specdoc for all specs (excluding plugin specs)"
+    Spec::Rake::SpecTask.new(:doc) do |t|
+      t.spec_opts = ["--format", "specdoc", "--dry-run"]
+      t.spec_files = FileList['spec/**/*_spec.rb']
     end
-  end
 
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-    ::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')
-    ::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')
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
+    desc "Print Specdoc for all plugin examples"
+    Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+      t.spec_opts = ["--format", "specdoc", "--dry-run"]
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+    end
 
-  namespace :db do
-    namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-      task :load => :environment do
-        require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
-        end
+    [:models, :controllers, :views, :helpers, :lib].each do |sub|
+      desc "Run the code examples in spec/#{sub}"
+      Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+        t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
       end
     end
-  end
 
-  namespace :server do
-    daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
+    desc "Run the code examples in vendor/plugins (except RSpec's own)"
+    Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+    end
 
-    desc "start spec_server."
-    task :start do
-      if File.exist?(daemonized_server_pid)
-        $stderr.puts "spec_server is already running."
-      else
-        $stderr.puts "Starting up spec server."
-        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+    namespace :plugins do
+      desc "Runs the examples for rspec_on_rails"
+      Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
+        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb']
       end
     end
 
-    desc "stop spec_server."
-    task :stop do
-      unless File.exist?(daemonized_server_pid)
-        $stderr.puts "No server running."
-      else
-        $stderr.puts "Shutting down spec_server."
-        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
-        File.delete(daemonized_server_pid)
+    # Setup specs for stats
+    task :statsetup do
+      require 'code_statistics'
+      ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+      ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+      ::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')
+      ::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')
+      ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+    end
+
+    namespace :db do
+      namespace :fixtures do
+        desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+        task :load => :environment do
+          require 'active_record/fixtures'
+          ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+            Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+          end
+        end
       end
     end
 
-    desc "reload spec_server."
-    task :restart do
-      unless File.exist?(daemonized_server_pid)
-        $stderr.puts "No server running."
-      else
-        $stderr.puts "Reloading down spec_server."
-        system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+    namespace :server do
+      daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
+
+      desc "start spec_server."
+      task :start do
+        if File.exist?(daemonized_server_pid)
+          $stderr.puts "spec_server is already running."
+        else
+          $stderr.puts "Starting up spec server."
+          system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+        end
+      end
+
+      desc "stop spec_server."
+      task :stop do
+        unless File.exist?(daemonized_server_pid)
+          $stderr.puts "No server running."
+        else
+          $stderr.puts "Shutting down spec_server."
+          system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+          File.delete(daemonized_server_pid)
+        end
+      end
+
+      desc "reload spec_server."
+      task :restart do
+        unless File.exist?(daemonized_server_pid)
+          $stderr.puts "No server running."
+        else
+          $stderr.puts "Reloading down spec_server."
+          system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+        end
       end
     end
   end
+rescue MissingSourceFile
+  # if rspec-rails is a configured gem, this will output helpful material and exit ...
+  require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+  # ... otherwise, do this:
+  raise <<-MSG
+
+  You have rspec-rails rake tasks installed in
+  #{__FILE__},
+  but rspec-rails is not configured as a gem in
+  config/environment.rb
+
+  Either remove #{__FILE__}
+  or configure the rspec-rails gem in config/environment.rb.
+
+MSG
 end
+

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -1,14 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>,
-      :new_record? => false<%= attributes.empty? ? '' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
+      :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
     )
   end
 
@@ -16,9 +17,9 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
     render "/<%= table_name %>/edit.<%= default_file_extension %>"
     
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
       with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]")
-<% end -%><% end -%>
+<% end -%>
     end
   end
 end

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -1,16 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= table_name %>] = [
 <% [1,2].each_with_index do |id, model_index| -%>
-      stub_model(<%= class_name %><%= attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-        :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
-<% if !attributes.empty? -%>
+      stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+        :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
       <%= model_index == 1 ? ')' : '),' %>
 <% end -%>
 <% end -%>
@@ -19,9 +20,9 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
 
   it "should render list of <%= table_name %>" do
     render "/<%= table_name %>/index.<%= default_file_extension %>"
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
     response.should have_tag("tr>td", <%= attribute.default_value %>, 2)
-<% end -%><% end -%>
+<% end -%>
   end
 end
 

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -1,14 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= file_name %>] = stub_model(<%= class_name %>,
-      :new_record? => true<%= attributes.empty? ? '' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
+      :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
     )
   end
 
@@ -16,9 +17,9 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
     render "/<%= table_name %>/new.<%= default_file_extension %>"
     
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
       with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]")
-<% end -%><% end -%>
+<% end -%>
     end
   end
 end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -1,23 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/show.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
-  
   before(:each) do
-    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= attributes.empty? ? ')' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
-<% if !attributes.empty? -%>
+    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
     )
 <% end -%>
   end
 
   it "should render attributes in <p>" do
     render "/<%= table_name %>/show.<%= default_file_extension %>"
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
     response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/)
-<% end -%><% end -%>
+<% end -%>
   end
 end
 

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

@@ -247,8 +247,11 @@ module Spec
         Spec::Example::ExampleGroupFactory.register(:controller, self)
       end
       
-      class PickedTemplate
+      # 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

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

@@ -103,11 +103,11 @@ module Spec
           add_helpers(options)
 
           assigns[:action_name] = @action_name
-
-          @request.path_parameters = {
-          :controller => derived_controller_name(options),
-          :action => derived_action_name(options)
-          }
+          
+          @request.path_parameters = @request.path_parameters.merge(
+            :controller => derived_controller_name(options),
+            :action => derived_action_name(options)
+          ).merge(options[:path_parameters] || {})
 
           defaults = { :layout => false }
           options = defaults.merge options

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/matchers/render_template.rb

@@ -53,16 +53,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 +81,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/version.rb

@@ -5,8 +5,9 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 11
+        MINESCULE = 1
 
-        STRING = [MAJOR, MINOR, TINY].join('.')
+        STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.')
 
         SUMMARY = "rspec-rails #{STRING}"
       end