rspec-rails 2.6.0.rc2 → 2.6.0.rc4

data/.gitignore

@@ -2,7 +2,6 @@ tmp
 doc
 pkg
 vendor
-.bundle
 *.gem
 Gemfile
 Gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,11 +1,9 @@
-script: "rake"
+script: "rake --trace 2>&1"
 rvm:
   - 1.8.7
-  - 1.9.1
   - 1.9.2
 gemfile:
-  - gemfiles/rails-3.0.6
+  - gemfiles/rails-3.0.7
   - gemfiles/rails-3-0-stable
-  - gemfiles/rails-master
 env:
-  - USE_GIT_REPOS=true
+  - CI=true

data/README.md

@@ -2,6 +2,8 @@
 
 rspec-2 for rails-3 with lightweight extensions to each
 
+[![build status](http://travis-ci.org/rspec/rspec-rails.png)](http://travis-ci.org/rspec/rspec-rails)
+
 NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
 
 ## Documentation

data/Rakefile

@@ -1,42 +1,29 @@
-unless File.exist?("./.gemfile")
-  warn <<-MESSAGE
-=============================================================================
-You must set the version of rails you want to run against. The simplest way
-to accomplish this is to install thor (if you don't already have it) and run:
-
-    thor rails:use 3.0.6
-
-You can use any of the following versions/branches:
-
-  3.0.0 .. 3.0.6
-  master
-  3-0-stable
-
-See the README_DEV.md file for more information.
-=============================================================================
-
-MESSAGE
-  exit 1
-end
-
 require 'pathname'
 ENV["BUNDLE_GEMFILE"] ||= begin
                             version = if File.exist?("./.gemfile")
                                         File.read("./.gemfile").chomp
                                       else
-                                        "rails-3.0.6"
+                                        "rails-3.0.7"
                                       end
                             File.expand_path("../gemfiles/#{version}", __FILE__)
                           end
 puts "Using gemfile: #{ENV["BUNDLE_GEMFILE"].gsub(Pathname.new(__FILE__).dirname.to_s,'').sub(/^\//,'')}"
 require "bundler"
-Bundler.setup
+begin
+  Bundler.setup
+rescue
+  if ENV["CI"]
+    sh "bundle install"
+    Bundler.setup
+  else
+    raise "You need to install a bundle first. Try 'thor rails:use 3.0.7'"
+  end
+end
 Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'yaml'
 
-require 'rake/rdoctask'
 require 'rspec'
 require 'rspec/core/rake_task'
 
@@ -83,10 +70,12 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
     unless File.directory?('./tmp/example_app')
-      sh "bin/rails new ./tmp/example_app"
+      sh "rails new ./tmp/example_app"
       bindir = File.expand_path("gemfiles/bin")
-      Dir.chdir("./tmp/example_app") do
-        sh "ln -s #{bindir}"
+      if test ?d, bindir
+        Dir.chdir("./tmp/example_app") do
+          sh "ln -s #{bindir}"
+        end
       end
     end
   end

data/features/.nav

@@ -4,6 +4,8 @@
 - Autotest.md (Autotest integration)
 - Changelog.md
 - Upgrade.md
+- request_specs:
+  - request_spec.feature
 - model_specs:
   - errors_on.feature
 - controller_specs:

data/features/Changelog.md

@@ -1,6 +1,19 @@
+### 2.6.0.rc4 / 2011-05-01
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0.rc2...v2.6.0.rc4)
+
+* Enhancements
+  * Update the controller spec generated by the rails scaffold generator:
+    * Add documentation to the generated spec
+    * Use `any_instance` to avoid stubbing finders
+    * Use real objects instead of `mock_model`
+  * Update capybara integration to work with capy 0.4 and 1.0.0.beta
+  * Decorate paths passed to `[append|prepend]_view_paths` with empty templates
+    unless rendering views. (Mark Turner)
+
 ### 2.6.0.rc2 / 2011-04-18
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.1.rc2)
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0.rc2)
 
 * Enhancments
   * rails 3 shortcuts for routing specs (Joe Fiorini)

data/features/GettingStarted.md

@@ -15,6 +15,10 @@ Install Rails-3
 
     $ bundle install
 
+### Bootstrap RSpec
+
+    $ rails generate rspec:install
+
 ### Generate a scaffold
 
     $ rails generate scaffold Widgets name:string
@@ -33,8 +37,48 @@ the files in the `spec` directory to RSpec.
 
 or
 
-    $ rspec spec
+    $ rspec spec --format documentation
 
 If all went well, you should see output ending with:
 
     29 examples, 0 failures, 2 pending
+
+This output also includes the following controller spec:
+
+    WidgetsController
+      GET index
+        assigns all widgets as @widgets
+      GET show
+        assigns the requested widget as @widget
+      GET new
+        assigns a new widget as @widget
+      GET edit
+        assigns the requested widget as @widget
+      POST create
+        with valid params
+          creates a new Widget
+          assigns a newly created widget as @widget
+          redirects to the created widget
+        with invalid params
+          assigns a newly created but unsaved widget as @widget
+          re-renders the 'new' template
+      PUT update
+        with valid params
+          updates the requested widget
+          assigns the requested widget as @widget
+          redirects to the widget
+        with invalid params
+          assigns the widget as @widget
+          re-renders the 'edit' template
+      DELETE destroy
+        destroys the requested widget
+        redirects to the widgets list
+
+Output like this can help to quickly gain a high level understanding of how an
+object behaves. It also exposes which cases have been specified and which have
+not. Note the balance between the examples for the `create` and `update`
+actions. If the `redirects to the widget` example was missing from one or the
+other, it would be easy to spot.
+
+Take a look at the generated `spec/controllers/widgets_controller_spec.rb` to
+get a sense of how to organize your specs to generate output like this.

data/features/controller_specs/controller_spec.feature

@@ -1,6 +1,5 @@
 Feature: controller spec
 
-
   Scenario: simple passing example
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """

data/features/controller_specs/isolation_from_views.feature

@@ -5,7 +5,7 @@ Feature: views are stubbed by default
   template an action should try to render regardless of whether the template
   compiles cleanly.
 
-  NOTE: unlike rspec-rails-1.x, the real template must exist. 
+  NOTE: unlike rspec-rails-1.x, the real template must exist.
 
   Scenario: expect template that is rendered by controller action (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
@@ -47,3 +47,49 @@ Feature: views are stubbed by default
     When I run `rspec spec`
     Then the output should contain "1 example, 1 failure"
 
+  Scenario: expect empty templates to render when view path is changed at runtime (passes)
+    Given a file named "spec/controllers/things_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe ThingsController do
+        describe "custom_action" do
+          it "renders an empty custom_action template" do
+            controller.prepend_view_path 'app/views'
+            controller.append_view_path 'app/views'
+            get :custom_action
+            response.should render_template("custom_action")
+            response.body.should == ""
+          end
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the examples should all pass
+
+  Scenario: expect template to render when view path is changed at runtime (fails)
+    Given a file named "spec/controllers/things_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe ThingsController do
+        describe "custom_action" do
+          it "renders the custom_action template" do
+            render_views
+            controller.prepend_view_path 'app/views'
+            get :custom_action
+            response.should render_template("custom_action")
+            response.body.should == ""
+          end
+
+          it "renders an empty custom_action template" do
+            controller.prepend_view_path 'app/views'
+            get :custom_action
+            response.should render_template("custom_action")
+            response.body.should == ""
+          end
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the output should contain "2 examples, 1 failure"

data/features/request_specs/request_spec.feature

@@ -0,0 +1,49 @@
+Feature: request spec
+
+  Request specs provide a thin wrapper around Rails' integration tests, and are
+  designed to drive behavior through the full stack, including routing
+  (provided by Rails) and without stubbing (that's up to you).
+
+  With request specs, you can:
+
+  * specify a single request
+  * specify multiple requests across multiple controllers
+  * specify multiple requests across multiple sessions
+
+  Check the rails documentation on integration tests for more information.
+
+  RSpec provides two matchers that delegate to Rails assertions:
+
+      render_template # delegates to assert_template
+      redirect_to     # delegates to assert_redirected_to
+
+  Check the Rails docs for details on these methods as well.
+
+  If you would like to use webrat or capybara with your request specs, all you
+  have to do is include one of them in your Gemfile and RSpec will
+  automatically load them in a request spec.
+
+  Scenario: specify managing a Widget with Rails integration methods
+    Given a file named "spec/requests/widget_management_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "Widget management" do
+
+        it "creates a Widget and redirects to the Widget's page" do
+          get "/widgets/new"
+          response.should render_template(:new)
+
+          post "/widgets", :widget => {:name => "My Widget"}
+
+          response.should redirect_to(assigns(:widget))
+          follow_redirect!
+
+          response.should render_template(:show)
+          response.body.should include("Widget was successfully created.")
+        end
+
+      end
+      """
+    When I run `rspec spec/requests/widget_management_spec.rb`
+    Then the example should pass

data/features/support/env.rb

@@ -1,5 +1,4 @@
 require 'aruba/cucumber'
-require 'webrat'
 
 module ArubaExt
   def run(cmd)

data/features/view_specs/view_spec.feature

@@ -16,8 +16,8 @@ Feature: view spec
 
           render
 
-          rendered.should contain("slicer")
-          rendered.should contain("dicer")
+          rendered.should =~ /slicer/
+          rendered.should =~ /dicer/
         end
       end
       """
@@ -42,8 +42,8 @@ Feature: view spec
           it "displays both widgets" do
             render
 
-            rendered.should contain("slicer")
-            rendered.should contain("dicer")
+            rendered.should =~ /slicer/
+            rendered.should =~ /dicer/
           end
         end
       end
@@ -62,7 +62,7 @@ Feature: view spec
 
           render :template => "widgets/widget.html.erb"
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -84,7 +84,7 @@ Feature: view spec
 
           render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -106,7 +106,7 @@ Feature: view spec
 
           render "widgets/widget", :widget => widget
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -127,7 +127,7 @@ Feature: view spec
 
           render :text => "This is directly rendered"
 
-          rendered.should contain("directly rendered")
+          rendered.should =~ /directly rendered/
         end
       end
       """
@@ -146,7 +146,7 @@ Feature: view spec
             page.hide 'status-indicator'
           end
 
-          rendered.should contain("Element.hide(\"status-indicator\")")
+          rendered.should =~ /Element.hide\(\"status-indicator\"\);/
         end
       end
       """
@@ -177,7 +177,7 @@ Feature: view spec
 
         it 'checks for admin access' do
           render
-          rendered.should contain('Secret admin area')
+          rendered.should =~ /Secret admin area/
         end
       end
       """

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/gemfiles/base.rb

@@ -7,7 +7,7 @@ module GemfileBase
         library_path = File.expand_path("../../../#{lib}", __FILE__)
         if File.exist?(library_path)
           gem lib, :path => library_path
-        elsif ENV["USE_GIT_REPOS"] == 'true'
+        elsif ENV["CI"] || ENV["USE_GIT_REPOS"]
           gem lib, :git => "git://github.com/rspec/#{lib}.git"
         else
           gem lib
@@ -15,26 +15,39 @@ module GemfileBase
       end
 
       gem 'sqlite3-ruby', :require => 'sqlite3'
-      # gem "cucumber", "~> 0.10.2"
-      # gem "aruba", :git => "git://github.com/aslakhellesoy/aruba"
-      gem "rcov", "0.9.9"
-      gem "relish", "0.2.0"
-      gem "guard-rspec", "0.1.9"
+      gem "cucumber", "~> 0.10.2"
+      gem "aruba", "~> 0.3.6"
       gem "growl", "1.0.3"
       gem "ZenTest", "~> 4.4.2"
-      gem "webrat", "0.7.2"
 
-      if RUBY_PLATFORM =~ /darwin/
-        gem "autotest-fsevent", "~> 0.2.4"
-        gem "autotest-growl", "~> 0.2.9"
-      end
+      # gem "webrat", "0.7.2"
+      # gem "capybara", "~> 0.4"
+      # gem "capybara", "1.0.0.beta1"
+
+      unless ENV['CI']
+        gem "rcov", "0.9.9"
+        gem "relish", "0.2.0"
+        gem "guard-rspec", "0.1.9"
+
+        if RUBY_PLATFORM =~ /darwin/
+          gem "autotest-fsevent", "~> 0.2.4"
+          gem "autotest-growl", "~> 0.2.9"
+        end
 
-      gem "ruby-debug", :platforms => :ruby_18
-      gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
+        platforms :mri_18 do
+          gem 'ruby-debug'
+        end
+
+        platforms :mri_19 do
+          gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
+          gem 'ruby-debug19'
+          gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
+        end
 
-      platforms :ruby_18, :ruby_19 do
-        gem "rb-fsevent", "~> 0.3.9"
-        gem "ruby-prof", "~> 0.9.2"
+        platforms :ruby_18, :ruby_19 do
+          gem "rb-fsevent", "~> 0.3.9"
+          gem "ruby-prof", "~> 0.9.2"
+        end
       end
 
       platforms :jruby do

data/gemfiles/rails-3.0.7

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.7"

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -2,72 +2,95 @@ require 'spec_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that
-# was generated by the Rails when you ran the scaffold generator.
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
 
 describe <%= controller_class_name %>Controller do
 
-  def <%= mock_file_name %>(stubs={})
-    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
+  # This should return the minimal set of attributes required to create a valid
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # update the return value of this method accordingly.
+  def valid_attributes
+    {}
   end
 
 <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= stub orm_class.all(class_name) %> { [<%= mock_file_name %>] }
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index
-      assigns(:<%= table_name %>).should eq([<%= mock_file_name %>])
+      assigns(:<%= table_name %>).should eq([<%= file_name %>])
     end
   end
 
 <% end -%>
   describe "GET show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :show, :id => "37"
-      assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :show, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= stub orm_class.build(class_name) %> { <%= mock_file_name %> }
       get :new
-      assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :edit, :id => "37"
-      assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :edit, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "POST create" do
     describe "with valid params" do
+      it "creates a new <%= class_name %>" do
+        expect {
+          post :create, :<%= ns_file_name %> => valid_attributes
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= stub orm_class.build(class_name, params) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= ns_file_name %> => <%= params %>
-        assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+        post :create, :<%= ns_file_name %> => valid_attributes
+        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
+        assigns(:<%= ns_file_name %>).should be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
-        <%= stub orm_class.build(class_name) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= ns_file_name %> => {}
-        response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
+        post :create, :<%= ns_file_name %> => valid_attributes
+        response.should redirect_to(<%= class_name %>.last)
       end
     end
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= stub orm_class.build(class_name, params) %> { <%= mock_file_name(:save => false) %> }
-        post :create, :<%= ns_file_name %> => <%= params %>
-        assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, :<%= ns_file_name %> => {}
         response.should render_template("new")
       end
@@ -77,34 +100,42 @@ describe <%= controller_class_name %>Controller do
   describe "PUT update" do
     describe "with valid params" do
       it "updates the requested <%= ns_file_name %>" do
-        <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-        mock_<%= should_receive orm_instance.update_attributes(params) %>
-        put :update, :id => "37", :<%= ns_file_name %> => <%= params %>
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # Assuming there are no other <%= table_name %> in the database, this
+        # specifies that the <%= class_name %> created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= params %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => <%= params %>
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
-        put :update, :id => "1"
-        assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => valid_attributes
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
-        put :update, :id => "1"
-        response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => valid_attributes
+        response.should redirect_to(<%= file_name %>)
       end
     end
 
     describe "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
-        put :update, :id => "1"
-        assigns(:<%= ns_file_name %>).should be(<%= mock_file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
-        put :update, :id => "1"
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s
         response.should render_template("edit")
       end
     end
@@ -112,14 +143,15 @@ describe <%= controller_class_name %>Controller do
 
   describe "DELETE destroy" do
     it "destroys the requested <%= ns_file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      mock_<%= should_receive orm_instance.destroy %>
-      delete :destroy, :id => "37"
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete :destroy, :id => <%= file_name %>.id.to_s
+      }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub orm_class.find(class_name) %> { <%= mock_file_name %> }
-      delete :destroy, :id => "1"
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete :destroy, :id => <%= file_name %>.id.to_s
       response.should redirect_to(<%= index_helper %>_url)
     end
   end

data/lib/rspec/rails/browser_simulators.rb

@@ -1,3 +1,8 @@
+begin
+  require 'capybara/rspec'
+rescue LoadError
+end
+
 begin
   require 'capybara/rails'
 rescue LoadError

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

@@ -90,7 +90,12 @@ module RSpec::Rails
     end
 
     capybara do
-      include Capybara
+      begin
+        include Capybara::DSL
+        include Capybara::RSpecMatchers
+      rescue
+        include Capybara
+      end
     end
 
     module ClassMethods

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

@@ -36,6 +36,10 @@ module RSpec::Rails
       include Webrat::Matchers
     end
 
+    capybara do
+      include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
+    end
+
     module ClassMethods
       def determine_default_helper_class(ignore)
         describes

data/lib/rspec/rails/example/mailer_example_group.rb

@@ -11,7 +11,11 @@ if defined?(ActionMailer)
       end
 
       capybara do
-        include Capybara
+        begin
+          include Capybara::RSpecMatchers
+        rescue
+          include Capybara
+        end
       end
 
       included do

data/lib/rspec/rails/example/request_example_group.rb

@@ -37,7 +37,7 @@ module RSpec::Rails
     end
 
     capybara do
-      include Capybara
+      include Capybara unless defined?(Capybara::DSL)
     end
 
     include RSpec::Rails::Matchers::RedirectTo

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

@@ -29,6 +29,10 @@ module RSpec::Rails
       include Webrat::Matchers
     end
 
+    capybara do
+      include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
+    end
+
     module ClassMethods
       def _default_helper
         base = metadata[:example_group][:description].split('/').first

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc2'
+      STRING = '2.6.0.rc4'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -49,15 +49,15 @@ module RSpec
 
       # Delegates find_all to the submitted path set and then returns templates
       # with modified source
-      class PathSetDelegatorResolver < ::ActionView::Resolver
-        attr_reader :path_set
+      class EmptyTemplatePathSetDecorator < ::ActionView::Resolver
+        attr_reader :original_path_set
 
-        def initialize(path_set)
-          @path_set = path_set
+        def initialize(original_path_set)
+          @original_path_set = original_path_set
         end
 
         def find_all(*args)
-          path_set.find_all(*args).collect do |template|
+          original_path_set.find_all(*args).collect do |template|
             ::ActionView::Template.new(
               "",
               template.identifier,
@@ -71,17 +71,33 @@ module RSpec
         end
       end
 
+      module EmptyTemplates
+        def prepend_view_path(new_path)
+          lookup_context.view_paths.unshift(*_path_decorator(new_path))
+        end
+
+        def append_view_path(new_path)
+          lookup_context.view_paths.push(*_path_decorator(new_path))
+        end
+
+        private
+        def _path_decorator(path)
+          EmptyTemplatePathSetDecorator.new(::ActionView::Base::process_view_paths(path))
+        end
+      end
+
       included do
         before do
           unless render_views?
-            @_path_set_delegator_resolver = PathSetDelegatorResolver.new(controller.class.view_paths)
-            controller.class.view_paths = ::ActionView::PathSet.new.push(@_path_set_delegator_resolver)
+            @_empty_view_path_set_delegator = EmptyTemplatePathSetDecorator.new(controller.class.view_paths)
+            controller.class.view_paths = ::ActionView::PathSet.new.push(@_empty_view_path_set_delegator)
+            controller.extend(EmptyTemplates)
           end
         end
 
         after do
           unless render_views?
-            controller.class.view_paths = @_path_set_delegator_resolver.path_set
+            controller.class.view_paths = @_empty_view_path_set_delegator.original_path_set
           end
         end
       end

data/spec/spec_helper.rb

@@ -9,35 +9,13 @@ require 'rspec/rails'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# TODO - most of this is borrowed from rspec-core's spec_helper - should
-# be extracted to something we can use here
-def in_editor?
-  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
-end
-
 class RSpec::Core::ExampleGroup
   def self.run_all(reporter=nil)
     run(reporter || RSpec::Mocks::Mock.new('reporter').as_null_object)
   end
 end
 
-module MatchesForRSpecRailsSpecs
-  extend RSpec::Matchers::DSL
-
-  matcher :be_included_in_files_in do |path|
-    match do |mod|
-      stub_metadata(
-        :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.include?(mod)
-    end
-  end
-end
-
 RSpec.configure do |c|
-  c.include MatchesForRSpecRailsSpecs
-  c.color_enabled = !in_editor?
   c.before(:each) do
     @real_world = RSpec.world
     RSpec.instance_variable_set(:@world, RSpec::Core::World.new)

data/spec/support/matchers.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers::define :be_included_in_files_in do |path|
+  match do |mod|
+    stub_metadata(
+      :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
+    )
+    group = RSpec::Core::ExampleGroup.describe
+    group.included_modules.include?(mod)
+  end
+end

data/templates/generate_stuff.rb

@@ -10,5 +10,12 @@ generate('observer widget')
 generate('scaffold gadget') # scaffold with no attributes
 generate('scaffold admin/accounts name:string') # scaffold with nested resource
 
+generate('controller things custom_action')
+template_code= <<-TEMPLATE
+  <% raise 'Error from custom_action because we should never render this template....derp derp derp' %>
+TEMPLATE
+
+file "app/views/things/custom_action.html.erb", template_code, {:force=>true}
+
 run('rake db:migrate')
 run('rake db:test:prepare')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424061
   prerelease: 6
   segments: 
   - 2
   - 6
   - 0
   - rc
-  - 2
-  version: 2.6.0.rc2
+  - 4
+  version: 2.6.0.rc4
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,13 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -05:00
+date: 2011-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +31,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: actionpack
+  requirement: *id001
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +46,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: railties
+  requirement: *id002
+  name: actionpack
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,25 +61,28 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: rspec
+  requirement: *id003
+  name: railties
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424049
+        hash: 15424061
         segments: 
         - 2
         - 6
         - 0
         - rc
-        - 2
-        version: 2.6.0.rc2
+        - 4
+        version: 2.6.0.rc4
+  prerelease: false
+  type: :runtime
   requirement: *id004
+  name: rspec
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com
 executables: []
@@ -127,6 +127,7 @@ files:
 - features/model_specs/README.md
 - features/model_specs/errors_on.feature
 - features/model_specs/transactional_examples.feature
+- features/request_specs/request_spec.feature
 - features/routing_specs/README.md
 - features/routing_specs/be_routable_matcher.feature
 - features/routing_specs/named_routes.feature
@@ -137,6 +138,7 @@ files:
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
+- gemfiles/.bundle/config
 - gemfiles/base.rb
 - gemfiles/rails-3-0-stable
 - gemfiles/rails-3.0.0
@@ -146,6 +148,7 @@ files:
 - gemfiles/rails-3.0.4
 - gemfiles/rails-3.0.5
 - gemfiles/rails-3.0.6
+- gemfiles/rails-3.0.7
 - gemfiles/rails-master
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -233,6 +236,7 @@ files:
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
+- spec/support/matchers.rb
 - templates/generate_stuff.rb
 - templates/run_specs.rb
 has_rdoc: true
@@ -267,10 +271,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.6.0.rc2
+summary: rspec-rails-2.6.0.rc4
 test_files: 
 - features/Autotest.md
 - features/Changelog.md
@@ -294,6 +298,7 @@ test_files:
 - features/model_specs/README.md
 - features/model_specs/errors_on.feature
 - features/model_specs/transactional_examples.feature
+- features/request_specs/request_spec.feature
 - features/routing_specs/README.md
 - features/routing_specs/be_routable_matcher.feature
 - features/routing_specs/named_routes.feature
@@ -331,3 +336,4 @@ test_files:
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
+- spec/support/matchers.rb