rspec-rails 3.0.0.beta1 → 3.0.0.beta2

data/Changelog.md

@@ -1,3 +1,31 @@
+### 3.0.0.beta2 / 2014-02-17
+[full changelog](http://github.com/rspec/rspec-rails/compare/v3.0.0.beta1...v3.0.0.beta2)
+
+Bug fixes
+
+* Use `__send__` rather than `send` to prevent naming collisions (Bradley Schaefer)
+* Supports Rails 4.1. (Andy Lindeman)
+* Routes are drawn correctly for anonymous controllers with abstract
+  parents. (Billy Chan)
+* Loads ActiveSupport properly to support changes in Rails 4.1. (Andy Lindeman)
+* Anonymous controllers inherit from `ActionController::Base` if `ApplicationController`
+  is not present. (Jon Rowe)
+* Require `rspec/collection_matchers` when `rspec/rails` is required. (Yuji Nakayama)
+
+Enhancements
+
+* Improve be_valid matcher for non-ActiveModel::Errors implementations (Ben Hamill)
+
+Breaking Changes for 3.0.0:
+
+* Removes the `--webrat` option for the request spec generator (Andy Lindeman)
+* Methods from `Capybara::DSL` (e.g., `visit`) are no longer available in
+  controller specs. It is more appropriate to use capybara in feature specs
+  (`spec/features`) instead. (Andy Lindeman)
+* `infer_base_class_for_anonymous_controllers` is
+  enabled by default. (Thomas Holmes)
+* Capybara 2.2.0 or above is required for feature specs. (Andy Lindeman)
+
 ### 3.0.0.beta1 / 2013-11-07
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v3.0.0.beta1)
 
@@ -6,6 +34,24 @@ Breaking Changes for 3.0.0:
 * Extracts `autotest` and `autotest-rails` support to `rspec-autotest` gem.
   (Andy Lindeman)
 
+### 2.99.0.beta2 / 2014-02-17
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta1...v2.99.0.beta2)
+
+Bug fixes
+
+* Use `__send__` rather than `send` to prevent naming collisions (Bradley Schaefer)
+* Supports Rails 4.1. (Andy Lindeman)
+* Loads ActiveSupport properly to support changes in Rails 4.1. (Andy Lindeman)
+* Anonymous controllers inherit from `ActionController::Base` if `ApplicationController`
+  is not present. (Jon Rowe)
+
+Deprecations
+
+* Deprecates the `--webrat` option to the scaffold and request spec generator (Andy Lindeman)
+* Deprecates the use of `Capybara::DSL` (e.g., `visit`) in controller specs.
+  It is more appropriate to use capybara in feature specs (`spec/features`)
+  instead. (Andy Lindeman)
+
 ### 2.99.0.beta1 / 2013-11-07
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.14.0...v2.99.0.beta1)
 

data/README.md

@@ -12,7 +12,7 @@ Add `rspec-rails` to **both** the `:development` and `:test` groups in the
 
 ```ruby
 group :development, :test do
-  gem 'rspec-rails', '~> 2.0'
+  gem 'rspec-rails', '~> 3.0.0.beta'
 end
 ```
 
@@ -189,7 +189,24 @@ FactoryGirl and Capybara seem to be the most widely used. Whether you choose
 these or other libs, we strongly recommend using something for each of these
 roles.
 
-# View specs
+## <a id="feature-specs"></a>Feature Specs
+
+Feature specs live in spec/features, and mix in functionality from the
+capybara gem.
+
+Feature specs test your application from the outside by simulating a browser.
+capybara is used to manage the simulated browser.
+
+To use feature specs, add `capybara` to `Gemfile`:
+
+```ruby
+gem "capybara"
+```
+
+For more information, see the [cucumber scenarios for feature
+specs](https://www.relishapp.com/rspec/rspec-rails/v/3-0/docs/feature-specs/feature-spec).
+
+## View specs
 
 View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
 
@@ -417,21 +434,6 @@ However, you must first clear the task that rspec-rails defined:
 task("spec").clear
 ```
 
-### Webrat and Capybara
-
-You can choose between webrat or capybara for simulating a browser, automating
-a browser, or setting expectations using the matchers they supply. Just add
-your preference to the Gemfile:
-
-```ruby
-gem "webrat"
-# ... or ...
-gem "capybara"
-```
-
-See [http://rubydoc.info/gems/rspec-rails/file/Capybara.md](http://rubydoc.info/gems/rspec-rails/file/Capybara.md)
-for more info on Capybara integration.
-
 # Contribute
 
 See [http://github.com/rspec/rspec-dev](http://github.com/rspec/rspec-dev).

data/features/Generators.md

@@ -22,3 +22,4 @@ The same generator pattern is available for all specs:
 * mailer
 * observer
 * integration
+* feature

data/features/README.md

@@ -1,10 +1,11 @@
-rspec-rails extends Rails' built-in testing framework to support rspec examples
-for requests, controllers, models, views, helpers, mailers and routing.
+rspec-rails extends Rails' built-in testing framework to support rspec
+examples for requests, controllers, models, views, helpers, mailers and
+routing.
 
-## Rails-3
+## Rails
 
-rspec-rails-2 supports rails-3.0.0 and later. For earlier versions of Rails,
-you need [rspec-rails-1.3](http://rspec.info).
+rspec-rails 3 supports Rails 3.x and 4.x. For earlier versions of Rails, you
+need [rspec-rails 1](https://github.com/dchelimsky/rspec-rails).
 
 ## Install
 
@@ -23,7 +24,7 @@ This installs the following gems:
 Add rspec-rails to the :test and :development groups in the Gemfile:
 
     group :test, :development do
-      gem "rspec-rails", "~> 2.4"
+      gem 'rspec-rails', '~> 3.0.0.beta'
     end
 
 It needs to be in the :development group to expose generators and rake tasks
@@ -36,15 +37,6 @@ Now you can run:
 This adds the spec directory and some skeleton files, including a .rspec
 file.
 
-## Webrat and Capybara
-
-You can choose between webrat or capybara for simulating a browser, automating
-a browser, or setting expectations using the matchers they supply. Just add
-your preference to the Gemfile:
-
-    gem "webrat"
-    gem "capybara"
-
 ## Issues
 
 The documentation for rspec-rails is a work in progress. We'll be adding

data/features/controller_specs/anonymous_controller.feature

@@ -1,23 +1,27 @@
 Feature: anonymous controller
 
-  Use the `controller` method to define an anonymous controller derived from
-  `ApplicationController`. This is useful for specifying behavior like global
-  error handling.
+  Use the `controller` method to define an anonymous controller
+  that will inherit from the described class. This is useful for
+  specifying behavior like global error handling.
 
-  To specify a different base class, you can pass the class explicitly to the
-  controller method:
+  To specify a different base class you can pass the class explicitly
+  to the controller method:
 
       controller(BaseController)
 
-  You can also configure RSpec to use the described class:
+  You can also disable base type inference, in which case anonymous
+  controllers will inherit from `ApplicationController` instead of
+  the described class by default:
 
-      RSpec.configure do |c|
-        c.infer_base_class_for_anonymous_controllers = true
+      Rspec.configure do |c|
+        c.infer_base_class_for_anonymous_controllers = false
       end
 
       describe BaseController do
         controller { ... }
-        # ^^ creates an anonymous subclass of `BaseController`
+        # ^^ would normally create an anonymous subclass of `BaseController`,
+        # but since `infer_base_class_for_anonymous_controllers` is disabled,
+        # it creates a subclass of `ApplicationController` instead
 
   Scenario: specify error handling in ApplicationController
     Given a file named "spec/controllers/application_controller_spec.rb" with:
@@ -97,10 +101,6 @@ Feature: anonymous controller
       """ruby
       require "spec_helper"
 
-      RSpec.configure do |c|
-        c.infer_base_class_for_anonymous_controllers = true
-      end
-
       class ApplicationController < ActionController::Base; end
 
       class ApplicationControllerSubclass < ApplicationController; end
@@ -120,6 +120,39 @@ Feature: anonymous controller
     When I run `rspec spec`
     Then the examples should all pass
 
+  Scenario: get name and controller_name from the described class
+    Given a file named "spec/controllers/get_name_and_controller_name_from_described_class_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      class ApplicationController < ActionController::Base; end
+      class FoosController < ApplicationController; end
+
+      describe "FoosController controller_name" do
+        controller FoosController do        
+          def index
+            @name = self.class.name
+            @controller_name = controller_name
+            render :text => "Hello World"
+          end
+        end
+
+        before do
+          get :index
+        end
+
+        it "gets the class name as described" do
+          expect(assigns[:name]).to eq('FoosController')
+        end
+
+        it "gets the controller_name as described" do
+          expect(assigns[:controller_name]).to eq('foos')
+        end
+      end
+      """
+    When I run `rspec spec`
+    Then the examples should all pass
+
   Scenario: invoke around filter in base class
     Given a file named "spec/controllers/application_controller_around_filter_spec.rb" with:
       """ruby
@@ -153,226 +186,251 @@ Feature: anonymous controller
 
   Scenario: anonymous controllers only create resource routes
     Given a file named "spec/controllers/application_controller_spec.rb" with:
-    """ruby
-    require "spec_helper"
-
-    describe ApplicationController do
-      controller do
-        def index
-          render :text => "index called"
-        end
+      """ruby
+      require "spec_helper"
 
-        def create
-          render :text => "create called"
-        end
+      describe ApplicationController do
+        controller do
+          def index
+            render :text => "index called"
+          end
 
-        def new
-          render :text => "new called"
-        end
+          def create
+            render :text => "create called"
+          end
 
-        def show
-          render :text => "show called"
-        end
+          def new
+            render :text => "new called"
+          end
 
-        def edit
-          render :text => "edit called"
-        end
+          def show
+            render :text => "show called"
+          end
 
-        def update
-          render :text => "update called"
-        end
+          def edit
+            render :text => "edit called"
+          end
 
-        def destroy
-          render :text => "destroy called"
-        end
+          def update
+            render :text => "update called"
+          end
 
-        def willerror
-          render :text => "will not render"
-        end
-      end
+          def destroy
+            render :text => "destroy called"
+          end
 
-      describe "#index" do
-        it "responds to GET" do
-          get :index
-          expect(response.body).to eq "index called"
+          def willerror
+            render :text => "will not render"
+          end
         end
 
-        it "also responds to POST" do
-          post :index
-          expect(response.body).to eq "index called"
-        end
+        describe "#index" do
+          it "responds to GET" do
+            get :index
+            expect(response.body).to eq "index called"
+          end
 
-        it "also responds to PUT" do
-          put :index
-          expect(response.body).to eq "index called"
-        end
+          it "also responds to POST" do
+            post :index
+            expect(response.body).to eq "index called"
+          end
 
-        it "also responds to DELETE" do
-          delete :index
-          expect(response.body).to eq "index called"
-        end
-      end
+          it "also responds to PUT" do
+            put :index
+            expect(response.body).to eq "index called"
+          end
 
-      describe "#create" do
-        it "responds to POST" do
-          post :create
-          expect(response.body).to eq "create called"
+          it "also responds to DELETE" do
+            delete :index
+            expect(response.body).to eq "index called"
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :create)
+        describe "#create" do
+          it "responds to POST" do
+            post :create
             expect(response.body).to eq "create called"
           end
-        end
-      end
 
-      describe "#new" do
-        it "responds to GET" do
-          get :new
-          expect(response.body).to eq "new called"
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :create)
+              expect(response.body).to eq "create called"
+            end
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :new)
+        describe "#new" do
+          it "responds to GET" do
+            get :new
             expect(response.body).to eq "new called"
           end
-        end
-      end
-
-      describe "#edit" do
-        it "responds to GET" do
-          get :edit, :id => "anyid"
-          expect(response.body).to eq "edit called"
-        end
 
-        it "requires the :id parameter" do
-          expect { get :edit }.to raise_error(ActionController::RoutingError)
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :new)
+              expect(response.body).to eq "new called"
+            end
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :edit, {:id => "anyid"})
+        describe "#edit" do
+          it "responds to GET" do
+            get :edit, :id => "anyid"
             expect(response.body).to eq "edit called"
           end
-        end
-      end
 
-      describe "#show" do
-        it "responds to GET" do
-          get :show, :id => "anyid"
-          expect(response.body).to eq "show called"
-        end
+          it "requires the :id parameter" do
+            expect { get :edit }.to raise_error(ActionController::RoutingError)
+          end
 
-        it "requires the :id parameter" do
-          expect { get :show }.to raise_error(ActionController::RoutingError)
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :edit, {:id => "anyid"})
+              expect(response.body).to eq "edit called"
+            end
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :show, {:id => "anyid"})
+        describe "#show" do
+          it "responds to GET" do
+            get :show, :id => "anyid"
             expect(response.body).to eq "show called"
           end
-        end
-      end
 
-      describe "#update" do
-        it "responds to PUT" do
-          put :update, :id => "anyid"
-          expect(response.body).to eq "update called"
-        end
+          it "requires the :id parameter" do
+            expect { get :show }.to raise_error(ActionController::RoutingError)
+          end
 
-        it "requires the :id parameter" do
-          expect { put :update }.to raise_error(ActionController::RoutingError)
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :show, {:id => "anyid"})
+              expect(response.body).to eq "show called"
+            end
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :update, {:id => "anyid"})
+        describe "#update" do
+          it "responds to PUT" do
+            put :update, :id => "anyid"
             expect(response.body).to eq "update called"
           end
-        end
-      end
 
-      describe "#destroy" do
-        it "responds to DELETE" do
-          delete :destroy, :id => "anyid"
-          expect(response.body).to eq "destroy called"
-        end
+          it "requires the :id parameter" do
+            expect { put :update }.to raise_error(ActionController::RoutingError)
+          end
 
-        it "requires the :id parameter" do
-          expect { delete :destroy }.to raise_error(ActionController::RoutingError)
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :update, {:id => "anyid"})
+              expect(response.body).to eq "update called"
+            end
+          end
         end
 
-        # And the rest...
-        %w{get post put delete}.each do |calltype|
-          it "responds to #{calltype}" do
-            send(calltype, :destroy, {:id => "anyid"})
+        describe "#destroy" do
+          it "responds to DELETE" do
+            delete :destroy, :id => "anyid"
             expect(response.body).to eq "destroy called"
           end
+
+          it "requires the :id parameter" do
+            expect { delete :destroy }.to raise_error(ActionController::RoutingError)
+          end
+
+          # And the rest...
+          %w{get post put delete}.each do |calltype|
+            it "responds to #{calltype}" do
+              send(calltype, :destroy, {:id => "anyid"})
+              expect(response.body).to eq "destroy called"
+            end
+          end
         end
-      end
 
-      describe "#willerror" do
-        it "cannot be called" do
-          expect { get :willerror }.to raise_error(ActionController::RoutingError)
+        describe "#willerror" do
+          it "cannot be called" do
+            expect { get :willerror }.to raise_error(ActionController::RoutingError)
+          end
         end
       end
-    end
-    """
+      """
     When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: draw custom routes for anonymous controllers
     Given a file named "spec/controllers/application_controller_spec.rb" with:
-    """ruby
-    require "spec_helper"
+      """ruby
+      require "spec_helper"
 
-    describe ApplicationController do
-      controller do
-        def custom
-          render :text => "custom called"
+      describe ApplicationController do
+        controller do
+          def custom
+            render :text => "custom called"
+          end
+        end
+
+        specify "a custom action can be requested if routes are drawn manually" do
+          routes.draw { get "custom" => "anonymous#custom" }
+
+          get :custom
+          expect(response.body).to eq "custom called"
         end
       end
+      """
+    When I run `rspec spec`
+    Then the examples should all pass
 
-      specify "a custom action can be requested if routes are drawn manually" do
-        routes.draw { get "custom" => "anonymous#custom" }
+  Scenario: draw custom routes for defined controllers
+    Given a file named "spec/controllers/application_controller_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      class FoosController < ApplicationController; end
+
+      describe ApplicationController do
+        controller FoosController do
+          def custom
+            render :text => "custom called"
+          end
+        end
 
-        get :custom
-        expect(response.body).to eq "custom called"
+        specify "a custom action can be requested if routes are drawn manually" do
+          routes.draw { get "custom" => "foos#custom" }
+
+          get :custom
+          expect(response.body).to eq "custom called"
+        end
       end
-    end
-    """
+      """
     When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: refer to application routes in the controller under test
     Given a file named "spec/controllers/application_controller_spec.rb" with:
-    """ruby
-    require "spec_helper"
+      """ruby
+      require "spec_helper"
 
-    Rails.application.routes.draw do
-      match "/login" => "sessions#new", :as => "login", :via => "get"
-    end
+      Rails.application.routes.draw do
+        match "/login" => "sessions#new", :as => "login", :via => "get"
+      end
 
-    describe ApplicationController do
-      controller do
-        def index
-          redirect_to login_url
+      describe ApplicationController do
+        controller do
+          def index
+            redirect_to login_url
+          end
         end
-      end
 
-      it "redirects to the login page" do
-        get :index
-        expect(response).to redirect_to("/login")
+        it "redirects to the login page" do
+          get :index
+          expect(response).to redirect_to("/login")
+        end
       end
-    end
-    """
+      """
     When I run `rspec spec`
     Then the examples should all pass