rspec-rails 2.0.0.beta.13 → 2.0.0.beta.14.1

data/README.markdown

@@ -1,13 +1,13 @@
 # rspec-rails-2
 
-This README aligns with the code in git HEAD. If you're looking for the README for
-the latest release, go to [http://github.com/rspec/rspec-rails](http://github.com/rspec/rspec-rails),
-and select the appropriate tag from the Switch Tags select list.
+rspec-2 for rails-3 with lightweight extensions to each
 
-## RSpec-2 for Rails-3
+NOTICE: rspec-rails-2.0.0.beta.13 only works with rails-3.0.0.beta4 or higher.
 
-rspec-rails-2 brings rspec-2 to rails-3 with lightweight extensions to both
-libraries.
+NOTICE: This README aligns with the code in git HEAD. If you're looking for the
+README for the latest release, go to
+[http://github.com/rspec/rspec-rails](http://github.com/rspec/rspec-rails), and
+select the appropriate tag from the Switch Tags select list.
 
 ## Install
 
@@ -25,7 +25,7 @@ This installs the following gems:
 
 Add this line to the Gemfile:
 
-    gem "rspec-rails", ">= 2.0.0.beta.8"
+    gem "rspec-rails", ">= 2.0.0.beta.13"
 
 This will expose generators, including rspec:install. Now you can run: 
 
@@ -60,35 +60,23 @@ or rails.  Many of the APIs from rspec-rails-1 have been carried forward,
 however, so upgrading an app from rspec-1/rails-2, while not pain-free, should
 not send you to the doctor with a migraine.
 
-## Synopsis
-
-* each example runs in its own transaction
-  * configurable in RSpec.configure
-    * see generated spec/spec\_helper.rb
-* model specs in spec/models
-* controller specs in spec/controllers
-* view specs in spec/views
-* mailer specs in spec/mailers
-* observer specs in spec/models
-* request specs in spec/requests
-  * these wrap rails integration tests
-* rails assertions
-* assertion-wrapping matchers
-  * redirect\_to
-  * render\_template
-* helper specs
-* webrat matchers
-* generators
-  * run "script/rails g" to see the list of available generators
-
 ## Known issues
 
 See http://github.com/rspec/rspec-rails/issues
 
 # Request Specs
 
-Request specs live in spec/requests, and mix in behavior
-from Rails' integration tests.
+Request specs live in spec/requests.
+
+    describe "widgets resource" do
+      describe "GET index" do
+        get "/widgets/index"
+        response.should have_selector("h1", :content => "Widgets")
+      end
+    end
+
+Request specs mix in behavior from Rails' integration tests. See the
+docs for ActionDispatch::Integration::Runner for more information.
 
 # Controller Specs
 
@@ -100,11 +88,12 @@ available from Rails.
 You can use RSpec expectations/matchers or Test::Unit assertions.
 
 ## `render_views`
-By default, controller specs do not render views (as of beta.9).
-This supports specifying controllers without concern for whether
-the views they render work correctly or even exist. If you prefer
-to render the views (a la Rails' functional tests), you can use the
-`render_views` declaration in each example group:
+By default, controller specs do not render views.  This supports specifying
+controllers without concern for whether the views they render work correctly
+(NOTE: the template must exist, unlike rspec-rails-1. See Upgrade.markdown for
+more information about this). If you prefer to render the views (a la Rails'
+functional tests), you can use the `render_views` declaration in each example
+group:
 
     describe SomeController do
       render_views
@@ -122,16 +111,6 @@ assigns to the view in the course of an action:
     get :index
     assigns(:widgets).should eq(expected_value)
 
-## `render_template`
-Delegates to Rails' assert_template:
-
-    response.should render_template("new")
-
-## `redirect_to`
-Delegates to assert_redirect
-
-    response.should redirect_to(widgets_path)
-
 # View specs
 
 View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
@@ -197,15 +176,6 @@ Routing specs live in spec/routing.
       end
     end
 
-## `route_to`
-
-Delegates to Rails' assert_routing.
-
-## `be_routable`
-
-Passes if the path is recognized by Rails' routing. This is primarily intended
-to be used with `should_not` to specify routes that should not be routable.
-
 # Helper specs
 
 Helper specs live in spec/helpers, and mix in ActionView::TestCase::Behavior.
@@ -220,3 +190,54 @@ Helper specs live in spec/helpers, and mix in ActionView::TestCase::Behavior.
         end
       end
     end
+
+# Matchers
+
+rspec-rails exposes domain-specific matchers to each of the example group types. Most
+of them simply delegate to Rails' assertions.
+
+## `be_a_new`
+* Available in all specs.
+* Primarily intended for controller specs
+
+<pre>
+object.should be_a_new(Widget)
+</pre>
+
+Passes if the object is a `Widget` and returns true for `new_record?`
+
+## `render_template`
+* Delegates to Rails' assert_template.
+* Available in request, controller, and view specs.
+
+In request and controller specs, apply to the response object:
+
+    response.should render_template("new")
+
+In view specs, apply to the view object:
+
+    view.should render_template(:partial => "_form", :locals => { :widget => widget } )
+
+## `redirect_to`
+* Delegates to assert_redirect
+* Available in request and controller specs.
+
+<pre>
+response.should redirect_to(widgets_path)
+</pre>
+
+## `route_to`
+
+* Delegates to Rails' assert_routing.
+* Available in routing and controller specs.
+
+<pre>
+{ :get => "/widgets" }.should route_to(:controller => "widgets", :action => "index")
+</pre>
+
+## `be_routable`
+
+Passes if the path is recognized by Rails' routing. This is primarily intended
+to be used with `should_not` to specify routes that should not be routable.
+
+    { :get => "/widgets/1/edit" }.should_not be_routable

data/Rakefile

@@ -38,7 +38,7 @@ begin
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
     gem.rubyforge_project = "rspec"
-    gem.add_dependency "rspec", gem.version
+    gem.add_dependency "rspec", ">= 2.0.0.beta.14"
     gem.add_dependency "webrat", ">= 0.7.0"
     gem.post_install_message = <<-EOM
 #{"*"*50}
@@ -53,6 +53,9 @@ begin
 
     script/rails generate rspec:install
 
+  Also, be sure to look at Upgrade.markdown to see 
+  what might have changed since the last release.
+
 #{"*"*50}
 EOM
   end
@@ -121,5 +124,5 @@ namespace :clobber do
   end
 end
 
-task :default => ["clobber:app", "generate:app", "generate:stuff", :smoke, :spec, :cucumber]
+task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :cucumber, :smoke]
 

data/Upgrade.markdown

@@ -2,23 +2,23 @@
 
 ## Controller specs
 
-### render_views
+### islation from view templates
 
-Controller specs, by default, do _not_ render views. This helps keep the
-controller specs focused on the controller. Use `render_views` instead of
-rspec-1's `integrate_views` to tell the spec to render the views:
+By default, controller specs do _not_ render view templates. This keeps
+controller specs isolated from the content of views and their requirements.
 
-    describe WidgetController do
-      render_views
-      
-      describe "GET index" do
-        ...
+NOTE that the template must exist, but it will not be rendered.  This is
+different from rspec-rails-1.x, in which the template didn't need to exist, but
+ActionController makes a number of new decisions in Rails 3 based on the
+existence of the template. To keep the RSpec code free of monkey patches, and
+to keep the rspec user experience simpler, we decided that this would be a fair
+trade-off.
 
 ## View specs
 
-Rails changed the way it renders partials, so to set an expectation that a partial
-gets rendered:
+Rails changed the way it renders partials, so to set an expectation that a
+partial gets rendered:
 
-    view.should_receive(:_render_partial).
-      with(hash_including(:partial => "widget/row"))
+    render
+    view.should render_template(:partial => "widget/_row")
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.13
+2.0.0.beta.14.1

data/features/controller_specs/{do_not_render_views.feature → isolation_from_views.feature}

@@ -1,11 +1,12 @@
 Feature: do not render views
 
-  By default, controller specs do not render views. This
-  allows you specify which view template an action should
-  try to render regardless of whether that template exists
-  or compiles cleanly.
+  By default, controller specs do not render views. This allows you specify
+  which view template an action should try to render regardless of whether or
+  not the template compiles cleanly.
 
-  Scenario: expect template that exists and is rendered by controller (passes)
+  NOTE: unlike rspec-rails-1.x, the template must exist.
+
+  Scenario: expect template that rendered by controller (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
@@ -26,7 +27,7 @@ Feature: do not render views
     When I run "rspec ./spec"
     Then I should see "2 examples, 0 failures"
 
-  Scenario: expect template that exists but is not rendered by controller (fails)
+  Scenario: expect template that is not rendered by controller (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
@@ -43,19 +44,19 @@ Feature: do not render views
     When I run "rspec ./spec"
     Then I should see "1 example, 1 failure"
 
-  Scenario: expect template that does not exist and is not rendered by controller (fails)
+  Scenario: set expectation about template content (fails with helpful message)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
 
       describe WidgetsController do
         describe "index" do
-          it "renders a template that does not exist" do
+          it "renders the 'new' template" do
             get :index
-            response.should render_template("does_not_exist")
+            response.should contain("foo")
           end
         end
       end
       """
-    When I run "rspec ./spec"
-    Then I should see "1 example, 1 failure"
+    When I run "rspec spec"
+    Then I should see "Template source generated by RSpec"

data/features/controller_specs/render_views.feature

@@ -1,7 +1,7 @@
 Feature: render views
 
-  You can tell a controller example group to render views
-  with the render_views declaration.
+  You can tell a controller example group to render views with the render_views
+  declaration.
 
   Scenario: expect template that exists and is rendered by controller (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
@@ -14,20 +14,20 @@ Feature: render views
         describe "index" do
           it "renders the index template" do
             get :index
-            response.should render_template("index")
+            response.should contain("Listing widgets")
           end
 
           it "renders the widgets/index template" do
             get :index
-            response.should render_template("widgets/index")
+            response.should contain("Listing widgets")
           end
         end
       end
       """
-    When I run "rspec ./spec"
+    When I run "rspec spec"
     Then I should see "2 examples, 0 failures"
 
-  Scenario: expect template that does not exist and is rendered by controller (passes)
+  Scenario: expect template that does not exist and is rendered by controller (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
@@ -44,10 +44,10 @@ Feature: render views
         describe "index" do
           it "renders the other template" do
             get :index
-            response.should render_template("other")
           end
         end
       end
       """
-    When I run "rspec ./spec"
+    When I run "rspec spec"
     Then I should see "1 example, 1 failure"
+    And I should see "Missing template"

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

@@ -1,7 +1,8 @@
 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.
+  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).
 
   Scenario: specify routeable route should be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
@@ -62,3 +63,18 @@ Feature: be_routable matcher
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
     Then I should see "1 example, 1 failure"
+
+  Scenario: be_routable in a controller spec
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        it "routes to /widgets" do
+          { :get => "/widgets" }.should be_routable
+        end
+      end
+      """
+
+    When I run "rspec spec/controllers/widgets_controller_spec.rb"
+    Then I should see "1 example, 0 failures"

data/lib/generators/rspec/install/templates/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails)
+require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   # == Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:

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

@@ -120,6 +120,15 @@ module Rspec
           response
         end
 
+        def value_for(attribute)
+          case attribute.type
+          when :string
+            "#{attribute.name.titleize}".inspect
+          else
+            attribute.default.inspect
+          end
+        end
+
     end
   end
 end

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

@@ -118,7 +118,7 @@ describe <%= controller_class_name %>Controller do
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:destroy => true) %> }
+      <%= stub! orm_class.find(class_name) %> { <%= mock_file_name %> }
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

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

@@ -7,7 +7,7 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
 <% [1,2].each_with_index do |id, model_index| -%>
       stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-        :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+        :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
       <%= model_index == 1 ? ')' : '),' %>
@@ -19,7 +19,7 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
   it "renders a list of <%= table_name %>" do
     render
 <% for attribute in output_attributes -%>
-    rendered.should have_selector("tr>td", :content => <%= attribute.default.inspect %>.to_s, :count => 2)
+    rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
 <% end -%>
   end
 end

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

@@ -5,7 +5,7 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
     @<%= file_name %> = assign(:<%= 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 ? '' : ','%>
+      :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
     ))
@@ -15,7 +15,7 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
-    rendered.should contain(<%= attribute.default.inspect %>)
+    rendered.should contain(<%= value_for(attribute) %>.to_s)
 <% end -%>
   end
 end