rspec-rails 2.0.0.beta.22 → 2.6.0

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

@@ -1,126 +1,158 @@
 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 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 <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :show, :id => "37"
-      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= 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 <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.build(class_name) %> { <%= mock_file_name %> }
+    it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new
-      assigns(:<%= 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 <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :edit, :id => "37"
-      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= 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 "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.build(class_name, params) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      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
+        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 <%= file_name %>" do
-        <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= file_name %> => {}
-        response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
+      it "redirects to the created <%= ns_file_name %>" do
+        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 <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.build(class_name, params) %> { <%= mock_file_name(:save => false) %> }
-        post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
+        # 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) %> }
-        post :create, :<%= 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 %> => {}
         response.should render_template("new")
       end
     end
-
   end
 
   describe "PUT update" do
-
     describe "with valid params" do
-      it "updates the requested <%= file_name %>" do
-        <%= should_receive! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-        mock_<%= should_receive! orm_instance.update_attributes(params) %>
-        put :update, :id => "37", :<%= file_name %> => <%= params %>
+      it "updates the requested <%= ns_file_name %>" do
+        <%= 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 <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
-        put :update, :id => "1"
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= 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 <%= 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 %>))
+      it "redirects to the <%= ns_file_name %>" do
+        <%= 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 <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
-        put :update, :id => "1"
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= 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, :<%= ns_file_name %> => {}
+        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, :<%= ns_file_name %> => {}
         response.should render_template("edit")
       end
     end
-
   end
 
   describe "DELETE destroy" do
-    it "destroys the requested <%= file_name %>" do
-      <%= should_receive! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      mock_<%= should_receive! orm_instance.destroy %>
-      delete :destroy, :id => "37"
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= 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"
-      response.should redirect_to(<%= table_name %>_url)
+      <%= 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/generators/rspec/scaffold/templates/edit_spec.rb

@@ -1,23 +1,31 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %>,
-      :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    ))
+<%= output_attributes.empty? ? "" : "    ))\n" -%>
   end
 
-  it "renders the edit <%= file_name %> form" do
+  it "renders the edit <%= ns_file_name %> form" do
     render
 
-    rendered.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
+<% if webrat? -%>
+    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
   end
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
@@ -16,10 +16,15 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
     ])
   end
 
-  it "renders a list of <%= table_name %>" do
+  it "renders a list of <%= ns_table_name %>" do
     render
 <% for attribute in output_attributes -%>
+<% if webrat? -%>
     rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
+<% end -%>
 <% end -%>
   end
 end

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

@@ -1,23 +1,30 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, stub_model(<%= class_name %>,
-      :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
+    assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    ))
-  end
+<%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
 
-  it "renders new <%= file_name %> form" do
+  it "renders new <%= ns_file_name %> form" do
     render
 
+<% if webrat? -%>
     rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form", :action => <%= index_helper %>_path, :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
   end
 end

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

@@ -4,33 +4,33 @@ describe <%= controller_class_name %>Controller do
   describe "routing" do
 
 <% unless options[:singleton] -%>
-    it "recognizes and generates #index" do
-      { :get => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "index")
+    it "routes to #index" do
+      get("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
-    it "recognizes and generates #new" do
-      { :get => "/<%= table_name %>/new" }.should route_to(:controller => "<%= table_name %>", :action => "new")
+    it "routes to #new" do
+      get("/<%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new")
     end
 
-    it "recognizes and generates #show" do
-      { :get => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "show", :id => "1")
+    it "routes to #show" do
+      get("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1")
     end
 
-    it "recognizes and generates #edit" do
-      { :get => "/<%= table_name %>/1/edit" }.should route_to(:controller => "<%= table_name %>", :action => "edit", :id => "1")
+    it "routes to #edit" do
+      get("/<%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1")
     end
 
-    it "recognizes and generates #create" do
-      { :post => "/<%= table_name %>" }.should route_to(:controller => "<%= table_name %>", :action => "create")
+    it "routes to #create" do
+      post("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#create")
     end
 
-    it "recognizes and generates #update" do
-      { :put => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "update", :id => "1")
+    it "routes to #update" do
+      put("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
-    it "recognizes and generates #destroy" do
-      { :delete => "/<%= table_name %>/1" }.should route_to(:controller => "<%= table_name %>", :action => "destroy", :id => "1")
+    it "routes to #destroy" do
+      delete("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1")
     end
 
   end

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
@@ -15,7 +15,12 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
+<% if webrat? -%>
     rendered.should contain(<%= value_for(attribute) %>.to_s)
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/<%= eval(value_for(attribute)) %>/)
+<% end -%>
 <% end -%>
   end
 end

data/lib/generators/rspec/view/view_generator.rb

@@ -7,7 +7,7 @@ module Rspec
 
       class_option :template_engine, :desc => "Template engine to generate view files"
 
-      def create_view_files
+      def create_view_specs
         empty_directory File.join("spec", "views", file_path)
 
         actions.each do |action|

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

@@ -56,15 +56,19 @@ module RSpec::Rails
   #
   # RSpec's preferred approach to spec'ing controller behaviour is to isolate
   # the controller from its collaborators.  By default, therefore, controller
-  # example groups do not render views. This means that a view template need
-  # not even exist in order to run a controller spec, and you can still specify
-  # which template the controller should render.
+  # example groups do not render the views in your app. Due to the way Rails
+  # searches for view templates, the template still needs to exist, but it
+  # won't actually be loaded.
+  #
+  # NOTE that this is different from rspec-rails-1 with rails-2, which did not
+  # require the presence of the file at all. Due to changes in rails-3, this
+  # was no longer feasible in rspec-rails-2.
   #
   # == View rendering
   #
-  # If you prefer a more integrated approach, similar to that of
-  # Rails' functional tests, you can tell controller groups to
-  # render views with the +render_views+ declaration:
+  # If you prefer a more integrated approach, similar to that of Rails'
+  # functional tests, you can tell controller groups to render the views in the
+  # app with the +render_views+ declaration:
   #
   #   describe WidgetsController do
   #     render_views
@@ -72,32 +76,12 @@ module RSpec::Rails
   #
   module ControllerExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
     include RSpec::Rails::RailsExampleGroup
-
     include ActionController::TestCase::Behavior
     include RSpec::Rails::ViewRendering
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
     include RSpec::Rails::Matchers::RoutingMatchers
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Methods
-      include Webrat::Matchers
-    end
-
-    capybara do
-      include Capybara
-    end
-
-    # TODO (DC 7/31/2010) this is already included in RailsExampleGroup, but
-    # due to some load order dependency problem between Webrat::Matchers and
-    # RSpec::Matchers, combined with the fact that RailsExampleGroup extends
-    # ActiveSupport::Concern, while the matcher modules do not, this needs to
-    # be here as well. At least for now.
-    include RSpec::Matchers
 
     module ClassMethods
       def controller_class
@@ -141,11 +125,9 @@ module RSpec::Rails
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
       def controller(base_class = ApplicationController, &body)
-        metadata[:example_group][:describes] = Class.new(base_class, &body)
-        metadata[:example_group][:describes].singleton_class.class_eval do
-          def name
-            "StubResourcesController"
-          end
+        base_class.dup.tap do |new_base|
+          def new_base.name; "StubResourcesController"; end
+          metadata[:example_group][:describes] = Class.new(new_base, &body)
         end
 
         before do
@@ -154,23 +136,32 @@ module RSpec::Rails
         end
 
         after do
-          @routes = @orig_routes
+          @routes, @orig_routes = @orig_routes, nil
         end
       end
     end
 
     module InstanceMethods
       attr_reader :controller, :routes
+
+      def method_missing(method, *args, &block)
+        if @orig_routes && @orig_routes.named_routes.helpers.include?(method)
+          controller.send(method, *args, &block)
+        else
+          super
+        end
+      end
     end
 
     included do
+      subject { controller }
+
       metadata[:type] = :controller
+
       before do
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','controllers')
   end
 end

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

@@ -27,17 +27,9 @@ module RSpec::Rails
   #
   module HelperExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
     include RSpec::Rails::RailsExampleGroup
-
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
-    include RSpec::Rails::BrowserSimulators
-
-    webrat do
-      include Webrat::Matchers
-    end
 
     module ClassMethods
       def determine_default_helper_class(ignore)
@@ -49,7 +41,10 @@ module RSpec::Rails
       # Returns an instance of ActionView::Base with the helper being specified
       # mixed in, along with any of the built-in rails helpers.
       def helper
-        _view.tap {|v| v.assign(_assigns)}
+        _view.tap do |v|
+          v.extend(ApplicationHelper) if defined?(ApplicationHelper)
+          v.assign(view_assigns)
+        end
       end
 
     private
@@ -61,11 +56,10 @@ module RSpec::Rails
 
     included do
       metadata[:type] = :helper
+
       before do
         controller.controller_path = _controller_path
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','helpers')
   end
 end

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

@@ -2,20 +2,8 @@ if defined?(ActionMailer)
   module RSpec::Rails
     module MailerExampleGroup
       extend ActiveSupport::Concern
-      extend RSpec::Rails::ModuleInclusion
-
       include RSpec::Rails::RailsExampleGroup
-
       include ActionMailer::TestCase::Behavior
-      include RSpec::Rails::BrowserSimulators
-
-      webrat do
-        include Webrat::Matchers
-      end
-
-      capybara do
-        include Capybara
-      end
 
       included do
         metadata[:type] = :mailer
@@ -29,8 +17,6 @@ if defined?(ActionMailer)
           describes
         end
       end
-
-      RSpec.configure &include_self_when_dir_matches('spec','mailers')
     end
   end
 end

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

@@ -1,14 +1,10 @@
 module RSpec::Rails
   module ModelExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
     include RSpec::Rails::RailsExampleGroup
 
     included do
       metadata[:type] = :model
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','models')
   end
 end

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

@@ -2,10 +2,8 @@ module RSpec
   module Rails
     module RailsExampleGroup
       extend ActiveSupport::Concern
-
       include RSpec::Rails::SetupAndTeardownAdapter
       include RSpec::Rails::TestUnitAssertionAdapter
-      include RSpec::Matchers
     end
   end
 end