dchelimsky-rspec-rails 1.1.12 → 1.1.99.1

data/History.txt

@@ -1,10 +1,37 @@
 === Maintenance
 
-IMPORTANT: rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2. We are no longer supporting 1.x versions of rails.
+IMPORTANT: This release includes the following backwards-compatibility-breaking changes.
 
-* 1 enhancement
+* rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2.
+  
+  * We are no longer supporting 1.x versions of rails.
+
+* expect_render and stub_render have been removed.
+
+  * Both of these methods were deprecated in rspec-rails-1.1.5, released in Sept, 2008.
+  
+* { route_for(args).should == "/path" } now delegates to assert_generates (in rails)
+
+  * see Upgrade.txt for more information
+  
+* enhancements
 
   * Adding status codes to redirect_to matcher (Damian Janowski). Closes #570.
+  * Initialize current URL before executing any examples in a ViewExampleGroup (Wilson Bilkovich). Closes #654.
+  * Support query strings in params_from (Wilson Bilkovich). Closes #652.
+  * delegate route_for to assert_recognizes (less brittle)
+  * it { should be_valid } (Kakutani). Closes #665.
+  * controller is implicit subject in controller specs (Joe Ferris). #686.
+  * template is implicit subject in view specs (Joe Ferris). #686.
+  * redirect_to and render_template matchers can accept controller or response (Joe Ferris). Closes #686. 
+  * generated specs use declarative docstrings
+  * rspec_scaffold generator generates layout and stylesheet (per Rails-2.3)
+  
+* bug fixes
+
+  * you no longer *have* to load ActionMailer to get specs to run. Closes #650.
+  * query_params are now parsed by Rack::Utils.parse_query in redirect_to matcher. Closes #684.
+  * cleaned up spec_server (there was a bunch of pre-rails 2.0 material). Closes #685.
 
 === Version 1.1.12 / 2009-01-11
 

data/License.txt

@@ -2,7 +2,7 @@
 
 ====================================================================
 ==== RSpec, RSpec-Rails
-Copyright (c) 2005-2008 The RSpec Development Team
+Copyright (c) 2005-2009 The RSpec Development Team
 ====================================================================
 ==== ARTS
 Copyright (c) 2006 Kevin Clark, Jake Howerton

data/Manifest.txt

@@ -4,6 +4,7 @@ Manifest.txt
 README.txt
 Rakefile
 TODO.txt
+Upgrade.txt
 features/step_definitions/people.rb
 features/support/env.rb
 features/transactions/transactions_should_rollback.feature
@@ -45,15 +46,14 @@ 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/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
@@ -66,6 +66,7 @@ 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
@@ -130,15 +131,15 @@ 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/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/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_spec_spec.rb
+spec/spec/rails/example/view_example_group_spec.rb
 spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
 spec/spec/rails/extensions/action_view_base_spec.rb
 spec/spec/rails/extensions/active_record_spec.rb

data/README.txt

@@ -2,15 +2,16 @@
 
 * http://rspec.info
 * http://rubyforge.org/projects/rspec
-* http://github.com/dchelimsky/rspec-rails/wikis
+* http://github.com/dchelimsky/rspec-rails
+* http://wiki.github.com/dchelimsky/rspec/rails
 * mailto:rspec-devel@rubyforge.org
 
 == DESCRIPTION:
 
 Behaviour Driven Development for Ruby on Rails.
 
-Spec::Rails (a.k.a. RSpec on Rails) is an RSpec extension that allows you
-to drive the development of your RoR application using RSpec.
+rspec-rails is an RSpec extension that allows you to drive the development of
+Ruby on Rails applications with RSpec.
 
 == FEATURES:
 
@@ -41,4 +42,4 @@ expectations you can set on responses and models, etc.
 
 == INSTALL
 
-* Visit http://github.com/dchelimsky/rspec-rails/wikis for installation instructions.
+* Visit http://wiki.github.com/dchelimsky/rspec/rails for installation instructions.

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 = [["rspec","1.1.12"]]
+  p.extra_deps = [["rspec","1.1.99.1"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
@@ -48,4 +48,16 @@ Spec::Rake::SpecTask.new
 
 Cucumber::Rake::Task.new
 
-task :default => [:features]
+task :default => [:features]
+
+namespace :update do
+  desc "update the manfest"
+  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/TODO.txt

@@ -0,0 +1 @@
+* delegate params_from to assert_recognizes

data/Upgrade.txt

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

data/generators/rspec/templates/rspec.rake

@@ -108,14 +108,14 @@ begin
     end
 
     namespace :server do
-      daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
-
+      daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/spec_server.pid")
+      
       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."
+          $stderr.puts %Q{Starting up spec_server ...}
           system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
         end
       end
@@ -125,19 +125,21 @@ begin
         unless File.exist?(daemonized_server_pid)
           $stderr.puts "No server running."
         else
-          $stderr.puts "Shutting down spec_server."
+          $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."
+      desc "restart spec_server."
+      task :restart => [:stop, :start]
+      
+      desc "check if spec server is running"
+      task :status do
+        if File.exist?(daemonized_server_pid)
+          $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
         else
-          $stderr.puts "Reloading down spec_server."
-          system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+          $stderr.puts "No server running."
         end
       end
     end

data/generators/rspec/templates/script/spec_server

@@ -1,125 +1,24 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec-rails/lib' # For rspec installed as plugin
 require 'rubygems'
-require 'drb/drb'
-require 'rbconfig'
-require 'spec'
 require 'optparse'
+require 'spec/rails/spec_server'
 
-# This is based on Florian Weber's TDDMate
-module Spec
-  module Runner
-    class RailsSpecServer
-      def run(argv, stderr, stdout)
-        $stdout = stdout
-        $stderr = stderr
-        
-        unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!)
-          base = ActiveRecord::Base
-          def base.clear_reloadable_connections!
-            active_connections.each do |name, conn|
-              if conn.requires_reloading?
-                conn.disconnect!
-                active_connections.delete(name)
-              end
-            end
-          end
-        end
-
-        ActiveRecord::Base.clear_reloadable_connections!
-
-        if ActionController.const_defined?(:Dispatcher)
-          dispatcher = ::ActionController::Dispatcher.new($stdout)
-          dispatcher.cleanup_application
-        elsif ::Dispatcher.respond_to?(:reset_application!)
-          ::Dispatcher.reset_application!
-        else
-          raise "Application reloading failed"
-        end
-        if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
-          Fixtures.reset_cache
-        end
-        
-        if ::ActiveSupport.const_defined?(:Dependencies)
-          ::ActiveSupport::Dependencies.mechanism = :load
-        else
-          ::Dependencies.mechanism = :load
-        end
-
-        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
-        load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
-
-        if in_memory_database?
-          load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default
-          ActiveRecord::Migrator.up('db/migrate') # use migrations
-        end
-
-        ::Spec::Runner::CommandLine.run(
-          ::Spec::Runner::OptionParser.parse(
-            argv,
-            $stderr,
-            $stdout
-          )
-        )
-      end
-
-      def in_memory_database?
-        ENV["RAILS_ENV"] == "test" and
-        ::ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and
-        ::Rails::Configuration.new.database_configuration['test']['database'] == ':memory:'
-      end
-    end
-  end
-end
 puts "Loading Rails environment"
 
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'dispatcher'
-
-def restart_test_server
-  puts "restarting"
-  config       = ::Config::CONFIG
-  ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
-  command_line = [ruby, $0, ARGV].flatten.join(' ')
-  exec(command_line)
-end
-
-def daemonize(pid_file = nil)
-  return yield if $DEBUG
-  pid = Process.fork{
-    Process.setsid
-    Dir.chdir(RAILS_ROOT)
-    trap("SIGINT"){ exit! 0 }
-    trap("SIGTERM"){ exit! 0 }
-    trap("SIGHUP"){ restart_test_server }
-    File.open("/dev/null"){|f|
-      STDERR.reopen f
-      STDIN.reopen  f
-      STDOUT.reopen f
-    }
-    yield
-  }
-  puts "spec_server launched. (PID: %d)" % pid
-  File.open(pid_file,"w"){|f| f.puts pid } if pid_file
-  exit! 0
-end
 
 options = Hash.new
-opts = OptionParser.new
-opts.on("-d", "--daemon"){|v| options[:daemon] = true }
-opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v }
-opts.parse!(ARGV)
-
-puts "Ready"
-exec_server = lambda {
-  trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2")
-  DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new)
-  DRb.thread.join
-}
+parser = OptionParser.new
+parser.on("-d", "--daemon")     {|ignore| options[:daemon] = true }
+parser.on("-p", "--pid PIDFILE"){|pid|    options[:pid]    = pid  }
+parser.parse!(ARGV)
 
 if options[:daemon]
-  daemonize(options[:pid], &exec_server)
+  ::Spec::Rails::SpecServer.daemonize(options[:pid])
 else
-  exec_server.call
+  ::Spec::Rails::SpecServer.run
 end
+
+puts "Ready"

data/generators/rspec_controller/rspec_controller_generator.rb

@@ -15,11 +15,7 @@ class RspecControllerGenerator < ControllerGenerator
       m.directory File.join('spec/helpers', class_path)
       m.directory File.join('spec/views', class_path, file_name)
 
-			if Rails::VERSION::STRING < "2.0.0"
-        @default_file_extension = "rhtml"
-      else
-        @default_file_extension = "html.erb"
-      end
+      @default_file_extension = "html.erb"
 
       # Controller spec, class, and helper.
       m.template 'controller_spec.rb',

data/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -30,19 +30,8 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
     
-    if Rails::VERSION::STRING < "2.0.0"
-      @resource_generator = "scaffold_resource"
-      @default_file_extension = "rhtml"
-		else
-      @resource_generator = "scaffold"
-      @default_file_extension = "html.erb"
-    end
-    
-    if ActionController::Base.respond_to?(:resource_action_separator)
-      @resource_edit_path = "/edit"
-    else
-      @resource_edit_path = ";edit"
-    end
+    @resource_generator = "scaffold"
+    @default_file_extension = "html.erb"
   end
 
   def manifest
@@ -57,12 +46,19 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       m.directory(File.join('app/controllers', controller_class_path))
       m.directory(File.join('app/helpers', controller_class_path))
       m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('app/views/layouts', controller_class_path))
+      m.directory(File.join('public/stylesheets', class_path))
+
       m.directory(File.join('spec/controllers', controller_class_path))
       m.directory(File.join('spec/models', class_path))
       m.directory(File.join('spec/helpers', class_path))
       m.directory File.join('spec/fixtures', class_path)
       m.directory File.join('spec/views', controller_class_path, controller_file_name)
       
+      # Layout and stylesheet.
+      m.template("#{@resource_generator}:layout.html.erb", File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
+      m.template("#{@resource_generator}:style.css", 'public/stylesheets/scaffold.css')
+
       # Controller spec, class, and helper.
       m.template 'rspec_scaffold:routing_spec.rb',
         File.join('spec/controllers', controller_class_path, "#{controller_file_name}_routing_spec.rb")

data/generators/rspec_scaffold/templates/controller_spec.rb

@@ -6,9 +6,9 @@ describe <%= controller_class_name %>Controller do
     @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs)
   end
   
-  describe "responding to GET index" do
+  describe "GET index" do
 
-    it "should expose all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+    it "exposes all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>])
       get :index
       assigns[:<%= table_name %>].should == [mock_<%= file_name %>]
@@ -16,7 +16,7 @@ describe <%= controller_class_name %>Controller do
 
     describe "with mime type of xml" do
   
-      it "should render all <%= table_name.pluralize %> as xml" do
+      it "renders all <%= table_name.pluralize %> as xml" do
         request.env["HTTP_ACCEPT"] = "application/xml"
         <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>"))
         <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML")
@@ -28,9 +28,9 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to GET show" do
+  describe "GET show" do
 
-    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :show, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -38,7 +38,7 @@ describe <%= controller_class_name %>Controller do
     
     describe "with mime type of xml" do
 
-      it "should render the requested <%= file_name %> as xml" do
+      it "renders the requested <%= file_name %> as xml" do
         request.env["HTTP_ACCEPT"] = "application/xml"
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML")
@@ -50,9 +50,9 @@ describe <%= controller_class_name %>Controller do
     
   end
 
-  describe "responding to GET new" do
+  describe "GET new" do
   
-    it "should expose a new <%= file_name %> as @<%= file_name %>" do
+    it "exposes a new <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>)
       get :new
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -60,9 +60,9 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to GET edit" do
+  describe "GET edit" do
   
-    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+    it "exposes the requested <%= file_name %> as @<%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       get :edit, :id => "37"
       assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
@@ -70,17 +70,17 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to POST create" do
+  describe "POST create" do
 
     describe "with valid params" do
       
-      it "should expose a newly created <%= file_name %> as @<%= file_name %>" do
+      it "exposes a newly created <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should redirect to the created <%= file_name %>" do
+      it "redirects to the created <%= file_name %>" do
         <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true))
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
@@ -90,13 +90,13 @@ describe <%= controller_class_name %>Controller do
     
     describe "with invalid params" do
 
-      it "should expose a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
+      it "exposes a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {:these => 'params'}
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should re-render the 'new' template" do
+      it "re-renders the 'new' template" do
         <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false))
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
@@ -106,23 +106,23 @@ describe <%= controller_class_name %>Controller do
     
   end
 
-  describe "responding to PUT udpate" do
+  describe "PUT udpate" do
 
     describe "with valid params" do
 
-      it "should update the requested <%= file_name %>" do
+      it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+      it "exposes the requested <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should redirect to the <%= file_name %>" do
+      it "redirects to the <%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
@@ -132,19 +132,19 @@ describe <%= controller_class_name %>Controller do
     
     describe "with invalid params" do
 
-      it "should update the requested <%= file_name %>" do
+      it "updates the requested <%= file_name %>" do
         <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
         mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
       end
 
-      it "should expose the <%= file_name %> as @<%= file_name %>" do
+      it "exposes the <%= file_name %> as @<%= file_name %>" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
       end
 
-      it "should re-render the 'edit' template" do
+      it "re-renders the 'edit' template" do
         <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
         put :update, :id => "1"
         response.should render_template('edit')
@@ -154,15 +154,15 @@ describe <%= controller_class_name %>Controller do
 
   end
 
-  describe "responding to DELETE destroy" do
+  describe "DELETE destroy" do
 
-    it "should destroy the requested <%= file_name %>" do
+    it "destroys the requested <%= file_name %>" do
       <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
       mock_<%= file_name %>.should_receive(:destroy)
       delete :destroy, :id => "37"
     end
   
-    it "should redirect to the <%= table_name %> list" do
+    it "redirects to the <%= table_name %> list" do
       <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true))
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -13,7 +13,7 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
     )
   end
 
-  it "should render edit form" do
+  it "renders the edit <%= file_name %> form" do
     render "/<%= table_name %>/edit.<%= default_file_extension %>"
     
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do

data/generators/rspec_scaffold/templates/helper_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep
 describe <%= controller_class_name %>Helper do
   
   #Delete this example and add some real ones or delete this file
-  it "should be included in the object returned by #helper" do
+  it "is included in the helper object" do
     included_modules = (class << helper; self; end).send :included_modules
     included_modules.should include(<%= controller_class_name %>Helper)
   end

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -18,7 +18,7 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
     ]
   end
 
-  it "should render list of <%= table_name %>" do
+  it "renders a list of <%= table_name %>" do
     render "/<%= table_name %>/index.<%= default_file_extension %>"
 <% for attribute in output_attributes -%>
     response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2)

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -13,7 +13,7 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
     )
   end
 
-  it "should render new form" do
+  it "renders new <%= file_name %> form" do
     render "/<%= table_name %>/new.<%= default_file_extension %>"
     
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do