rspec-rails 2.4.1 → 2.5.0

data/features/Upgrade.md

@@ -36,6 +36,18 @@ is what you need to change:
 
 ## Controller specs
 
+### islation from view templates
+
+By default, controller specs do _not_ render view templates. This keeps
+controller specs isolated from the content of views and their requirements.
+
+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.
+
 ### `response.should render_template`
 
 This needs to move from before the action to after. For example:
@@ -54,3 +66,51 @@ fix releases in RSpec). Part of the philosophy of rspec-rails-2 is to rely on
 public APIs in Rails as much as possible. In this case, `render_template`
 delegates directly to Rails' `assert_template`, which only works after the
 action.
+
+## View specs
+
+### `view.should render_template`
+
+Rails changed the way it renders partials, so to set an expectation that a
+partial gets rendered, you need 
+
+    render
+    view.should render_template(:partial => "widget/_row")
+
+### stub_template
+
+Introduced in rspec-rails-2.2, simulates the presence of view templates on the
+file system. This supports isolation from partials rendered by the vew template
+that is the subject of a view example:
+
+    stub_template "widgets/_widget.html.erb" => "This Content"
+
+### No more `have_tag`
+
+Before Webrat came along, rspec-rails had its own `have_tag` matcher that
+wrapped Rails' `assert_select`. Webrat included a replacement for `have_tag` as
+well as new matchers (`have_selector` and `have_xpath`), all of which rely on
+Nokogiri to do its work, and are far less brittle than RSpec's `have_tag`.
+
+Capybara has similar matchers, which will soon be available view specs (they
+are already available in controller specs with `render_views`).
+
+Given the brittleness of RSpec's `have_tag` matcher and the presence of new
+Webrat and Capybara matchers that do a better job, `have_tag` was not included
+in rspec-rails-2.
+
+## Mocks, stubs, doubles
+
+### as_new_record
+
+Earlier versions of the view generators generated stub_model with `:new_record?
+=> true`. That is no longer recognized in rspec-rails-2, so you need to change
+this:
+  
+    stub_model(Widget, :new_record? => true)
+
+to this:
+
+    stub_model(Widget).as_new_record
+
+Generators in 2.0.0 final release will do the latter.

data/features/controller_specs/README.md

@@ -2,8 +2,9 @@ Controller specs live in `spec/controllers` or any example group with
 `:type => :controller`.
 
 A controller spec is an RSpec wrapper for a Rails functional test
-(ActionController::TestCase::Behavior).  It allows you to simulate a single
-http request in each example, and then specify expected outcomes, including:
+([ActionController::TestCase::Behavior](https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/test_case.rb)).
+It allows you to simulate a single http request in each example, and then
+specify expected outcomes such as:
 
 * rendered templates
 * redirects

data/features/controller_specs/anonymous_controller.feature

@@ -37,7 +37,7 @@ Feature: anonymous controller
     end
     """
     When I run "rspec spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: specify error handling in subclass of ApplicationController
     Given a file named "spec/controllers/application_controller_subclass_spec.rb" with:
@@ -75,4 +75,4 @@ Feature: anonymous controller
     end
     """
     When I run "rspec spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/controller_specs/isolation_from_views.feature

@@ -1,6 +1,6 @@
 Feature: views are stubbed by default
 
-  By default, controller specs stub views with template that renders an empty
+  By default, controller specs stub views with a template that renders an empty
   string instead of the views in the app. This allows you specify which view
   template an action should try to render regardless of whether the template
   compiles cleanly.
@@ -28,7 +28,7 @@ Feature: views are stubbed by default
       end
       """
     When I run "rspec ./spec"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: expect template that is not rendered by controller action (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:

data/features/controller_specs/render_views.feature

@@ -1,9 +1,9 @@
 Feature: render_views
 
   You can tell a controller example group to render views with the
-  `render_views` declaration.
+  `render_views` declaration in any individual group, or globally.
 
-  Scenario: expect template that exists and is rendered by controller (passes)
+  Scenario: render_views directly in a single group
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper"
@@ -11,48 +11,18 @@ Feature: render_views
       describe WidgetsController do
         render_views
 
-        describe "index" do
-          it "renders the index template" do
+        describe "GET index" do
+          it "says 'Listing widgets'" do
             get :index
-            response.should contain("Listing widgets")
-          end
-
-          it "renders the widgets/index template" do
-            get :index
-            response.should contain("Listing widgets")
+            response.body.should =~ /Listing widgets/m
           end
         end
       end
       """
     When I run "rspec spec"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
-  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"
-
-      describe WidgetsController do
-        render_views
-
-        before do
-          def controller.index
-            render :template => "other"
-          end
-        end
-
-        describe "index" do
-          it "renders the other template" do
-            get :index
-          end
-        end
-      end
-      """
-    When I run "rspec spec"
-    Then the output should contain "1 example, 1 failure"
-    And the output should contain "Missing template"
-
-  Scenario: render_views on and off in diff contexts
+  Scenario: render_views on and off in nested groups
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper"
@@ -61,19 +31,30 @@ Feature: render_views
         context "with render_views" do
           render_views
 
-          describe "index" do
+          describe "GET index" do
             it "renders the actual template" do
               get :index
               response.body.should =~ /Listing widgets/m
             end
           end
+
+          context "with render_views(false) nested in a group with render_views" do
+            render_views false
+
+            describe "GET index" do
+              it "renders the RSpec generated template" do
+                get :index
+                response.body.should eq("")
+              end
+            end
+          end
         end
 
         context "without render_views" do
-          describe "index" do
+          describe "GET index" do
             it "renders the RSpec generated template" do
               get :index
-              response.body.should == ""
+              response.body.should eq("")
             end
           end
         end
@@ -81,26 +62,32 @@ Feature: render_views
         context "with render_views again" do
           render_views
 
-          describe "index" do
+          describe "GET index" do
             it "renders the actual template" do
               get :index
               response.body.should =~ /Listing widgets/m
             end
           end
         end
-
-        context "without render_views again" do
-          describe "index" do
-            it "renders the RSpec generated template" do
-              get :index
-              response.body.should == ""
-            end
-          end
-        end
       end
       """
-    When I run "rspec spec"
-    Then the output should contain "4 examples, 0 failures"
+    When I run "rspec spec --format documentation"
+    Then the output should contain:
+      """
+      WidgetsController
+        with render_views
+          GET index
+            renders the actual template
+          with render_views(false) nested in a group with render_views
+            GET index
+              renders the RSpec generated template
+        without render_views
+          GET index
+            renders the RSpec generated template
+        with render_views again
+          GET index
+            renders the actual template
+      """
 
   Scenario: render_views globally
     Given a file named "spec/support/render_views.rb" with:
@@ -114,19 +101,14 @@ Feature: render_views
       require "spec_helper"
 
       describe WidgetsController do
-        describe "index" do
+        describe "GET index" do
           it "renders the index template" do
             get :index
-            response.should contain("Listing widgets")
-          end
-
-          it "renders the widgets/index template" do
-            get :index
-            response.should contain("Listing widgets")
+            response.body.should =~ /Listing widgets/m
           end
         end
       end
       """
     When I run "rspec spec"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
     

data/features/helper_specs/helper_spec.feature

@@ -26,7 +26,7 @@ Feature: helper spec
       end
       """
     When I run "rspec spec/helpers/application_helper_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     
   Scenario: helper method that accesses an instance variable
     Given a file named "spec/helpers/application_helper_spec.rb" with:
@@ -51,7 +51,7 @@ Feature: helper spec
       end
       """
     When I run "rspec spec/helpers/application_helper_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: application helper is included in helper object
     Given a file named "spec/helpers/widgets_helper_spec.rb" with:
@@ -84,4 +84,4 @@ Feature: helper spec
       end
       """
     When I run "rspec spec/helpers/widgets_helper_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/mailer_specs/url_helpers.feature

@@ -16,7 +16,7 @@ Feature: URL helpers in mailer examples
       end
       """
     When I run "rspec spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: using URL helpers without default options
     Given a file named "config/initializers/mailer_defaults.rb" with:
@@ -35,4 +35,4 @@ Feature: URL helpers in mailer examples
       end
       """
     When I run "rspec spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/matchers/new_record_matcher.feature

@@ -25,7 +25,7 @@ Feature: be_a_new matcher
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: example spec using be_a_new.with
     Given a file named "spec/models/widget_spec.rb" with:
@@ -67,4 +67,4 @@ Feature: be_a_new matcher
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass

data/features/matchers/redirect_to_matcher.feature

@@ -37,4 +37,4 @@ Feature: redirect_to matcher
       end
       """
     When I run "rspec spec/controllers/widgets_controller_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass

data/features/matchers/render_template_matcher.feature

@@ -22,4 +22,4 @@ Feature: render_template matcher
       end
       """
     When I run "rspec spec/controllers/gadgets_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass

data/features/mocks/mock_model.feature

@@ -37,7 +37,7 @@ Feature: mock_model
       end
       """
     When I run "rspec spec/models/car_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing a string that represents an existing constant
     Given a file named "spec/models/widget_spec.rb" with:
@@ -52,7 +52,7 @@ Feature: mock_model
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing a class that does not extend ActiveModel::Naming
     Given a file named "spec/models/string_spec.rb" with:
@@ -66,7 +66,7 @@ Feature: mock_model
       end
       """
     When I run "rspec spec/models/string_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing an Active Record constant
     Given a file named "spec/models/widget_spec.rb" with:
@@ -95,7 +95,7 @@ Feature: mock_model
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: passing an Active Record constant with method stubs
     Given a file named "spec/models/widget_spec.rb" with:
@@ -128,4 +128,4 @@ Feature: mock_model
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass

data/features/mocks/stub_model.feature

@@ -35,7 +35,7 @@ Feature: stub_model
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
     
   Scenario: passing an Active Record constant with a block of stubs
     Given a file named "spec/models/widget_spec.rb" with:
@@ -55,4 +55,4 @@ Feature: stub_model
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/model_specs/errors_on.feature

@@ -29,4 +29,4 @@ Feature: errors_on
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass

data/features/model_specs/transactional_examples.feature

@@ -21,7 +21,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: run in transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
@@ -48,7 +48,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: disable transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
@@ -77,7 +77,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: run in transactions with fixture
     Given a file named "spec/models/thing_spec.rb" with:
@@ -97,7 +97,7 @@ Feature: transactional examples
         name: MyString
       """
     When I run "rspec spec/models/thing_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass