rspec-rails 2.3.1 → 2.4.0

data/features/routing_specs/README.md

@@ -0,0 +1,16 @@
+Routing specs live in the `spec/routing` directory. 
+
+Simple apps with nothing but standard RESTful routes won't get much value from
+routing specs, but they can provide significant value when used to specify
+customized routes, like vanity links, slugs, etc.
+
+    { :get => "/articles/2012/11/when-to-use-routing-specs" }.
+      should route_to(
+        :controller => "articles",
+        :month => "2012-11",
+        :slug => "when-to-use-routing-specs"
+      )
+
+They are also valuable for routes that should not be available:
+
+    { :delete => "/accounts/37" }.should_not be_routable

data/features/{matchers → routing_specs}/be_routable_matcher.feature

@@ -1,47 +1,47 @@
 Feature: be_routable matcher
 
-  The be_routable matcher is intended for use with should_not to specify that a
-  given route should_not be_routable. It is available in routing specs (in
-  spec/routing) and controller specs (in spec/controller).
+  The `be_routable` matcher is best used with `should_not` to specify that a
+  given route should not be routable. It is available in routing specs (in
+  spec/routing) and controller specs (in spec/controllers).
 
-  Scenario: specify routeable route should be routable (passes)
+  Scenario: specify routeable route should not be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
       """
       require "spec_helper"
 
-      describe WidgetsController do
-        it "routes to /widgets" do
-          { :get => "/widgets" }.should be_routable
+      describe "routes for Widgets" do
+        it "does not route to widgets" do
+          { :get => "/widgets" }.should_not be_routable
         end
       end
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the output should contain "1 example, 1 failure"
 
-  Scenario: specify routeable route should not be routable (fails)
+  Scenario: specify non-routeable route should not be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
       """
       require "spec_helper"
 
-      describe WidgetsController do
-        it "does not route to widgets" do
-          { :get => "/widgets" }.should_not be_routable
+      describe "routes for Widgets" do
+        it "does not route to widgets/foo/bar" do
+          { :get => "/widgets/foo/bar" }.should_not be_routable
         end
       end
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 1 failure"
+    Then the output should contain "1 example, 0 failures"
 
-  Scenario: specify non-routeable route should not be routable (passes)
+  Scenario: specify routeable route should be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
       """
       require "spec_helper"
 
-      describe WidgetsController do
-        it "does not route to widgets/foo/bar" do
-          { :get => "/widgets/foo/bar" }.should_not be_routable
+      describe "routes for Widgets" do
+        it "routes to /widgets" do
+          { :get => "/widgets" }.should be_routable
         end
       end
       """
@@ -54,7 +54,7 @@ Feature: be_routable matcher
       """
       require "spec_helper"
 
-      describe WidgetsController do
+      describe "routes for Widgets" do
         it "routes to widgets/foo/bar" do
           { :get => "/widgets/foo/bar" }.should be_routable
         end

data/features/routing_specs/{access_to_named_routes.feature → named_routes.feature}

@@ -1,13 +1,16 @@
-Feature: access to named routes in routing specs
+Feature: named routes
 
-  Scenario: access existing named route
+  Routing specs have access to named routes.
+
+  Scenario: access named route
     Given a file named "spec/routing/widget_routes_spec.rb" with:
       """
       require "spec_helper"
 
       describe "routes to the widgets controller" do
         it "routes a named route" do
-          {:get => new_widget_path}.should route_to(:controller => "widgets", :action => "new")
+          {:get => new_widget_path}.
+            should route_to(:controller => "widgets", :action => "new")
         end
       end
       """

data/features/routing_specs/route_to_matcher.feature

@@ -0,0 +1,38 @@
+Feature: route_to matcher
+
+  The `route_to` matcher specifies that a request (verb + uri) is routable.  It
+  is most valuable when specifying routes other than standard RESTful routes.
+
+      { :get => "/" }.should route_to(:controller => "welcome")
+
+  Scenario: passing route spec
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "routes for Widgets" do
+        it "routes /widgets to the widgets controller" do
+          { :get => "/widgets" }.
+            should route_to(:controller => "widgets", :action => "index")
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: route spec for a route that doesn't exist (fails)
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "routes for Widgets" do
+        it "routes /widgets/foo to the /foo action" do
+          { :get => "/widgets/foo" }.
+            should route_to(:controller => "widgets", :action => "foo")
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then the output should contain "1 example, 1 failure"

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -97,21 +97,21 @@ module Rspec
         #   should! orm_class.find(User, "37")
         #   #=> User.should_receive(:get).with(37)
         #
-        def should_receive!(chain)
+        def should_receive(chain)
           stub_or_should_chain(:should_receive, chain)
         end
 
         # Receives the ORM chain and convert to stub. For ActiveRecord:
         #
-        #   stub! orm_class.find(User, "37")
-        #   #=> User.stub!(:find).with(37)
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:find).with(37)
         #
         # For Datamapper:
         #
-        #   stub! orm_class.find(User, "37")
-        #   #=> User.stub!(:get).with(37)
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:get).with(37)
         #
-        def stub!(chain)
+        def stub(chain)
           stub_or_should_chain(:stub, chain)
         end
 

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

@@ -1,17 +1,19 @@
 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.
+
 describe <%= controller_class_name %>Controller do
 
   def <%= mock_file_name %>(stubs={})
-    (@<%= mock_file_name %> ||= mock_model(<%= class_name %>).as_null_object).tap do |<%= file_name %>|
-      <%= file_name %>.stub(stubs) unless stubs.empty?
-    end
+    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
   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 %>] }
+      <%= stub orm_class.all(class_name) %> { [<%= mock_file_name %>] }
       get :index
       assigns(:<%= table_name %>).should eq([<%= mock_file_name %>])
     end
@@ -20,7 +22,7 @@ describe <%= controller_class_name %>Controller do
 <% 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 %> }
+      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
       get :show, :id => "37"
       assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
     end
@@ -28,7 +30,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET new" do
     it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.build(class_name) %> { <%= mock_file_name %> }
+      <%= stub orm_class.build(class_name) %> { <%= mock_file_name %> }
       get :new
       assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
     end
@@ -36,23 +38,22 @@ describe <%= controller_class_name %>Controller do
 
   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 %> }
+      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
       get :edit, :id => "37"
       assigns(:<%= file_name %>).should be(<%= mock_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) %> }
+        <%= 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 %>)
       end
 
       it "redirects to the created <%= file_name %>" do
-        <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => true) %> }
+        <%= 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 %>))
       end
@@ -60,37 +61,35 @@ describe <%= controller_class_name %>Controller do
 
     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) %> }
+        <%= 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 %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
+        <%= stub orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
         post :create, :<%= 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) %>
+        <%= stub 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 %>
       end
 
       it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
+        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
         put :update, :id => "1"
         assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
+        <%= 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 %>))
       end
@@ -98,29 +97,28 @@ describe <%= controller_class_name %>Controller do
 
     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) %> }
+        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
         put :update, :id => "1"
         assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
+        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
         put :update, :id => "1"
         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 %>
+      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
+      mock_<%= should_receive orm_instance.destroy %>
       delete :destroy, :id => "37"
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub! orm_class.find(class_name) %> { <%= mock_file_name %> }
+      <%= stub orm_class.find(class_name) %> { <%= mock_file_name %> }
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

data/lib/rspec/rails.rb

@@ -15,4 +15,3 @@ require 'rspec/rails/module_inclusion'
 require 'rspec/rails/browser_simulators'
 require 'rspec/rails/example'
 
-

data/lib/rspec/rails/example.rb

@@ -5,4 +5,32 @@ require 'rspec/rails/example/helper_example_group'
 require 'rspec/rails/example/view_example_group'
 require 'rspec/rails/example/mailer_example_group'
 require 'rspec/rails/example/routing_example_group'
-require 'rspec/rails/example/model_example_group'
+require 'rspec/rails/example/model_example_group'
+
+RSpec::configure do |c|
+  def c.escaped_path(*parts)
+    Regexp.compile(parts.join('[\\\/]'))
+  end
+
+  c.include RSpec::Rails::ControllerExampleGroup, :type => :controller, :example_group => {
+    :file_path => c.escaped_path(%w[spec controllers])
+  }
+  c.include RSpec::Rails::HelperExampleGroup, :type => :helper, :example_group => {
+    :file_path => c.escaped_path(%w[spec helpers])
+  }
+  c.include RSpec::Rails::MailerExampleGroup, :type => :mailer, :example_group => {
+    :file_path => c.escaped_path(%w[spec mailers])
+  }
+  c.include RSpec::Rails::ModelExampleGroup, :type => :model, :example_group => {
+    :file_path => c.escaped_path(%w[spec models])
+  }
+  c.include RSpec::Rails::RequestExampleGroup, :type => :request, :example_group => {
+    :file_path => c.escaped_path(%w[spec (requests|integration)])
+  }
+  c.include RSpec::Rails::RoutingExampleGroup, :type => :routing, :example_group => {
+    :file_path => c.escaped_path(%w[spec routing])
+  }
+  c.include RSpec::Rails::ViewExampleGroup, :type => :view, :example_group => {
+    :file_path => c.escaped_path(%w[spec views])
+  }
+end

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

@@ -72,11 +72,9 @@ module RSpec::Rails
   #
   module ControllerExampleGroup
     extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
-
-    include RSpec::Rails::RailsExampleGroup
 
     include ActionController::TestCase::Behavior
+    include RSpec::Rails::RailsExampleGroup
     include RSpec::Rails::ViewRendering
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
@@ -172,7 +170,5 @@ module RSpec::Rails
         end
       end
     end
-
-    RSpec.configure &include_self_when_dir_matches('spec','controllers')
   end
 end

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

@@ -27,11 +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::RailsExampleGroup
     include RSpec::Rails::ViewAssigns
     include RSpec::Rails::BrowserSimulators
 
@@ -49,7 +47,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(view_assigns)}
+        _view.tap do |v|
+          v.extend(ApplicationHelper) if defined?(ApplicationHelper)
+          v.assign(view_assigns)
+        end
       end
 
     private
@@ -66,7 +67,5 @@ module RSpec::Rails
         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,11 +2,9 @@ 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::RailsExampleGroup
       include RSpec::Rails::BrowserSimulators
 
       webrat do
@@ -29,8 +27,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,11 @@
 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