rspec-rails 2.11.4 → 2.12.0

data/features/matchers/relation_match_array.feature

@@ -1,19 +1,21 @@
 Feature: ActiveRecord::Relation match array
 
-  The `=~` matcher can be used with an `ActiveRecord::Relation` (scope). The
-  assertion will pass if the scope would return all of the elements specified
-  in the array on the right hand side.
+  The `match_array` matcher can be used with an `ActiveRecord::Relation`
+  (scope). The assertion will pass if the scope would return all of the
+  elements specified in the array on the right hand side.
 
-  Scenario: example spec with relation =~ matcher
+  Scenario: example spec with relation match_array matcher
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Widget do
         let!(:widgets) { Array.new(3) { Widget.create } }
         subject { Widget.scoped }
 
-        it { should =~ widgets }
+        it "returns all widgets in any order" do
+          expect(subject).to match_array(widgets)
+        end
       end
       """
     When I run `rspec spec/models/widget_spec.rb`

data/features/matchers/render_template_matcher.feature

@@ -11,18 +11,39 @@ Feature: render_template matcher
 
   Scenario: render_template with three possible options
     Given a file named "spec/controllers/gadgets_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe GadgetsController do
         describe "GET #index" do
           subject { get :index }
 
-          it { should render_template(:index) }
-          it { should render_template("index") }
-          it { should render_template("gadgets/index") }
+          it "renders the index template" do
+            expect(subject).to render_template(:index)
+            expect(subject).to render_template("index")
+            expect(subject).to render_template("gadgets/index")
+          end
         end
       end
       """
     When I run `rspec spec/controllers/gadgets_spec.rb`
     Then the examples should all pass
+
+  Scenario: render_template in a view spec
+    Given a file named "spec/views/gadgets/index.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "gadgets/index" do
+        it "renders the index template" do
+          assign(:gadgets, [stub_model(Gadget)])
+          render
+
+          expect(view).to render_template(:index)
+          expect(view).to render_template("index")
+          expect(view).to render_template("gadgets/index")
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass

data/features/mocks/mock_model.feature

@@ -13,25 +13,25 @@ Feature: mock_model
    
   Scenario: passing a string that represents a non-existent constant
     Given a file named "spec/models/car_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "mock_model('Car') with no Car constant in existence" do
         it "generates a constant" do
-          Object.const_defined?(:Car).should be_false
+          expect(Object.const_defined?(:Car)).to be_false
           mock_model("Car")
-          Object.const_defined?(:Car).should be_true
+          expect(Object.const_defined?(:Car)).to be_true
         end
 
         describe "generates an object that ..." do
           it "returns the correct name" do
             car = mock_model("Car")
-            car.class.name.should eq("Car")
+            expect(car.class.name).to eq("Car")
           end
 
           it "says it is a Car" do
             car = mock_model("Car")
-            car.should be_a(Car)
+            expect(car).to be_a(Car)
           end
         end
       end
@@ -41,13 +41,13 @@ Feature: mock_model
 
   Scenario: passing a string that represents an existing constant
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Widget do
         it "uses the existing constant" do
           widget = mock_model("Widget")
-          widget.should be_a(Widget)
+          expect(widget).to be_a(Widget)
         end
       end
       """
@@ -56,7 +56,7 @@ Feature: mock_model
 
   Scenario: passing a class that does not extend ActiveModel::Naming
     Given a file named "spec/models/string_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe String do
@@ -70,27 +70,27 @@ Feature: mock_model
 
   Scenario: passing an Active Record constant
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Widget do
         let(:widget) { mock_model(Widget) }
 
         it "is valid by default" do
-          widget.should be_valid
+          expect(widget).to be_valid
         end
 
         it "is not a new record by default" do
-          widget.should_not be_new_record
+          expect(widget).not_to be_new_record
         end
 
         it "can be converted to a new record" do
-          widget.as_new_record.should be_new_record
+          expect(widget.as_new_record).to be_new_record
         end
 
         it "sets :id to nil upon destroy" do
           widget.destroy
-          widget.id.should be_nil
+          expect(widget.id).to be_nil
         end
       end
       """
@@ -99,7 +99,7 @@ Feature: mock_model
 
   Scenario: passing an Active Record constant with method stubs
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "mock_model(Widget) with stubs" do
@@ -110,18 +110,18 @@ Feature: mock_model
         end
 
         it "supports stubs for methods that don't exist in ActiveModel or ActiveRecord" do
-          widget.foo.should eq("bar")
+          expect(widget.foo).to eq("bar")
         end
 
         it "supports stubs for methods that do exist" do
-          widget.save.should eq(true)
-          widget.update_attributes.should be_false
+          expect(widget.save).to eq(true)
+          expect(widget.update_attributes).to be_false
         end
 
         describe "#errors" do
           context "with update_attributes => false" do
             it "is not empty" do
-              widget.errors.should_not be_empty
+              expect(widget.errors).not_to be_empty
             end
           end
         end
@@ -132,14 +132,14 @@ Feature: mock_model
 
   Scenario: mock_model outside rails
     Given a file named "mock_model_outside_rails_spec.rb" with:
-      """
+      """ruby
       require 'rspec/rails/mocks'
 
       describe "Foo" do
         it "is mockable" do
           foo = mock_model("Foo")
-          foo.id.should eq(1001)
-          foo.to_param.should eq("1001")
+          expect(foo.id).to eq(1001)
+          expect(foo.to_param).to eq("1001")
         end
       end
       """

data/features/mocks/stub_model.feature

@@ -8,7 +8,7 @@ Feature: stub_model
    
   Scenario: passing an Active Record constant with a hash of stubs
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "stub_model(Widget) with a hash of stubs" do
@@ -17,20 +17,20 @@ Feature: stub_model
         end
         
         it "stubs :id" do
-          widget.id.should eql(5)
+          expect(widget.id).to eql(5)
         end
         
         it "stubs :random_attribute" do
-          widget.random_attribute.should be_true
+          expect(widget.random_attribute).to be_true
         end
         
         it "returns false for new_record? if :id is set" do
-          widget.should_not be_new_record
+          expect(widget).not_to be_new_record
         end
         
         it "can be converted to a new record" do
           widget.as_new_record
-          widget.should be_new_record
+          expect(widget).to be_new_record
         end
       end
       """
@@ -39,7 +39,7 @@ Feature: stub_model
     
   Scenario: passing an Active Record constant with a block of stubs
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "stub_model(Widget) with a block of stubs" do
@@ -50,9 +50,9 @@ Feature: stub_model
         end
         
         it "stubs :id" do
-          widget.id.should eql(5)
+          expect(widget.id).to eql(5)
         end
       end
       """
     When I run `rspec spec/models/widget_spec.rb`
-    Then the examples should all pass
+    Then the examples should all pass

data/features/model_specs/errors_on.feature

@@ -2,30 +2,48 @@ Feature: errors_on
 
   Scenario: with one validation error
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       class ValidatingWidget < ActiveRecord::Base
-        set_table_name :widgets
+        self.table_name = :widgets
         validates_presence_of :name
-        attr_accessible :name
+
+        # In Rails 4, mass assignment protection is implemented on controllers
+        attr_accessible :name if Rails.version < '4'
+
+        validates_length_of :name, :minimum => 10, :on => :publication
       end
 
       describe ValidatingWidget do
         it "fails validation with no name (using error_on)" do
-          ValidatingWidget.new.should have(1).error_on(:name)
+          expect(ValidatingWidget.new).to have(1).error_on(:name)
         end
 
         it "fails validation with no name (using errors_on)" do
-          ValidatingWidget.new.should have(1).errors_on(:name)
+          expect(ValidatingWidget.new).to have(1).errors_on(:name)
+        end
+
+        it "fails validation with no name expecting a specific message" do
+          expect(ValidatingWidget.new.errors_on(:name)).to include("can't be blank")
+        end
+
+        it "fails validation with a short name (using a validation context)" do
+          expect(ValidatingWidget.new(:name => "too short")).
+            to have(1).errors_on(:name, :context => :publication)
+        end
+
+        it "passes validation with a longer name (using a validation context)" do
+          expect(ValidatingWidget.new(:name => "a longer name")).
+            to have(0).errors_on(:name, :context => :publication)
         end
 
         it "passes validation with a name (using 0)" do
-          ValidatingWidget.new(:name => "liquid nitrogen").should have(0).errors_on(:name)
+          expect(ValidatingWidget.new(:name => "liquid nitrogen")).to have(0).errors_on(:name)
         end
 
         it "passes validation with a name (using :no)" do
-          ValidatingWidget.new(:name => "liquid nitrogen").should have(:no).errors_on(:name)
+          expect(ValidatingWidget.new(:name => "liquid nitrogen")).to have(:no).errors_on(:name)
         end
       end
       """

data/features/model_specs/transactional_examples.feature

@@ -7,21 +7,21 @@ Feature: transactional examples
 
   Scenario: run in transactions (default)
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Widget do
         it "has none to begin with" do
-          Widget.count.should == 0
+          expect(Widget.count).to eq 0
         end
 
         it "has one after adding one" do
           Widget.create
-          Widget.count.should == 1
+          expect(Widget.count).to eq 1
         end
 
         it "has none after one was created in a previous example" do
-          Widget.count.should == 0
+          expect(Widget.count).to eq 0
         end
       end
       """
@@ -30,7 +30,7 @@ Feature: transactional examples
 
   Scenario: run in transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       RSpec.configure do |c|
@@ -39,16 +39,16 @@ Feature: transactional examples
 
       describe Widget do
         it "has none to begin with" do
-          Widget.count.should == 0
+          expect(Widget.count).to eq 0
         end
 
         it "has one after adding one" do
           Widget.create
-          Widget.count.should == 1
+          expect(Widget.count).to eq 1
         end
 
         it "has none after one was created in a previous example" do
-          Widget.count.should == 0
+          expect(Widget.count).to eq 0
         end
       end
       """
@@ -57,7 +57,7 @@ Feature: transactional examples
 
   Scenario: disable transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       RSpec.configure do |c|
@@ -67,16 +67,16 @@ Feature: transactional examples
 
       describe Widget do
         it "has none to begin with" do
-          Widget.count.should == 0
+          expect(Widget.count).to eq 0
         end
 
         it "has one after adding one" do
           Widget.create
-          Widget.count.should == 1
+          expect(Widget.count).to eq 1
         end
 
         it "has one after one was created in a previous example" do
-          Widget.count.should == 1
+          expect(Widget.count).to eq 1
         end
 
         after(:all) { Widget.destroy_all }
@@ -87,7 +87,7 @@ Feature: transactional examples
 
   Scenario: run in transactions with fixture
     Given a file named "spec/models/thing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Thing do

data/features/request_specs/request_spec.feature

@@ -19,28 +19,28 @@ Feature: request spec
 
   Check the Rails docs for details on these methods as well.
 
-  If you would like to use webrat or capybara with your request specs, all you
-  have to do is include one of them in your Gemfile and RSpec will
-  automatically load them in a request spec.
+  [Capybara](http://github.com/jnicklas/capybara) is no longer supported in
+  request specs as of Capybara 2.0.0. The recommended way to use Capybara is
+  with [feature specs](../feature_specs/feature_spec.feature).
 
   Scenario: specify managing a Widget with Rails integration methods
     Given a file named "spec/requests/widget_management_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "Widget management" do
 
         it "creates a Widget and redirects to the Widget's page" do
           get "/widgets/new"
-          response.should render_template(:new)
+          expect(response).to render_template(:new)
 
           post "/widgets", :widget => {:name => "My Widget"}
 
-          response.should redirect_to(assigns(:widget))
+          expect(response).to redirect_to(assigns(:widget))
           follow_redirect!
 
-          response.should render_template(:show)
-          response.body.should include("Widget was successfully created.")
+          expect(response).to render_template(:show)
+          expect(response.body).to include("Widget was successfully created.")
         end
 
       end

data/features/routing_specs/be_routable_matcher.feature

@@ -6,12 +6,12 @@ Feature: be_routable matcher
 
   Scenario: specify routeable route should not be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "does not route to widgets" do
-          { :get => "/widgets" }.should_not be_routable
+          expect(:get => "/widgets").not_to be_routable
         end
       end
       """
@@ -21,12 +21,12 @@ Feature: be_routable matcher
 
   Scenario: specify non-routeable route should not be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "does not route to widgets/foo/bar" do
-          { :get => "/widgets/foo/bar" }.should_not be_routable
+          expect(:get => "/widgets/foo/bar").not_to be_routable
         end
       end
       """
@@ -36,12 +36,12 @@ Feature: be_routable matcher
 
   Scenario: specify routeable route should be routable (passes)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes to /widgets" do
-          { :get => "/widgets" }.should be_routable
+          expect(:get => "/widgets").to be_routable
         end
       end
       """
@@ -51,12 +51,12 @@ Feature: be_routable matcher
 
   Scenario: specify non-routeable route should be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes to widgets/foo/bar" do
-          { :get => "/widgets/foo/bar" }.should be_routable
+          expect(:get => "/widgets/foo/bar").to be_routable
         end
       end
       """
@@ -66,12 +66,12 @@ Feature: be_routable matcher
 
   Scenario: be_routable in a controller spec
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
         it "routes to /widgets" do
-          { :get => "/widgets" }.should be_routable
+          expect(:get => "/widgets").to be_routable
         end
       end
       """