rspec-rails 2.12.2 → 2.13.0

data/Changelog.md

@@ -1,3 +1,18 @@
+### 2.13.0 / 2013-02-23
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.2...v2.13.0)
+
+Enhancements
+
+* `be_valid` matcher includes validation error messages. (Tom Scott)
+* Adds cucumber scenario showing how to invoke an anonymous controller's
+  non-resourceful actions. (Paulo Luis Franchini Casaretto)
+* Null template handler is used when views are stubbed. (Daniel Schierbeck)
+* The generated `spec_helper.rb` in Rails 4 includes a check for pending
+  migrations. (Andy Lindeman)
+* Adds `rake spec:features` task. (itzki)
+* Rake tasks are automatically generated for each spec/ directory.
+  (Rudolf Schmidt)
+
 ### 2.12.2 / 2013-01-12
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.1...v2.12.2)
 
@@ -7,6 +22,8 @@ Bug fixes
   to support testing of redirection and generation of URLs from other contexts.
   The implementation ended up breaking the ability to refer to non-anonymous
   routes in the context of the controller under test.
+* Uses `assert_select` correctly in view specs generated by scaffolding. (Andy
+  Lindeman)
 
 ### 2.12.1 / 2013-01-07
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.12.0...v2.12.1)

data/README.md

@@ -1,26 +1,11 @@
-# rspec-rails-2 [![Build Status](https://secure.travis-ci.org/rspec/rspec-rails.png?branch=master)](http://travis-ci.org/rspec/rspec-rails) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rspec/rspec-rails)
+# rspec-rails [![Build Status](https://secure.travis-ci.org/rspec/rspec-rails.png?branch=master)](http://travis-ci.org/rspec/rspec-rails) [![Code Climate](https://codeclimate.com/github/rspec/rspec-rails.png)](https://codeclimate.com/github/rspec/rspec-rails)
 
-rspec-2 for rails-3 with lightweight extensions to each
+**rspec-rails 2** is a testing framework for Rails 3.x and 4.x.
 
-Note: Use [rspec-rails-1.3](http://github.com/dchelimsky/rspec-rails) for rails-2.
+Use **[rspec-rails 1](http://github.com/dchelimsky/rspec-rails)** for Rails 2.x.
 
 ## Install
 
-```
-gem install rspec-rails
-```
-
-This installs the following gems:
-
-```
-rspec-core
-rspec-expectations
-rspec-mocks
-rspec-rails
-```
-
-## Configure
-
 Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
 ```ruby
@@ -43,65 +28,74 @@ the "rake spec" task.
 
 ### Generators
 
-If you type `script/rails generate`, the only RSpec generator you'll actually
-see is `rspec:install`. That's because RSpec is registered with Rails as the
-test framework, so whenever you generate application components like models,
-controllers, etc, RSpec specs are generated instead of Test::Unit tests.
+Once installed, RSpec will generate spec file instead of Test::Unit test files
+when commands like `rails generate model` and `rails generate controller` are
+used.
 
-Please note that the generators are there to help you get started, but they are
-no substitute for writing your own examples, and they are only guaranteed to
-work out of the box for the default scenario (`ActiveRecord` & `Webrat`).
 
-### Webrat and Capybara
+## Model Specs
 
-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:
+Model specs reside in the `spec/models` folder. Use model specs to describe
+behavior of models (usually ActiveRecord-based) in the application. For example:
 
 ```ruby
-gem "webrat"
-gem "capybara"
-```
+require "spec_helper"
 
-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.
+describe User do
+  it "orders by last name" do
+    lindeman = User.create!(first_name: "Andy", last_name: "Lindeman")
+    chelimsky = User.create!(first_name: "David", last_name: "Chelimsky")
 
+    expect(User.ordered_by_last_name).to eq([chelimsky, lindeman])
+  end
+end
+```
+
+For more information, see [cucumber scenarios for model
+specs](https://www.relishapp.com/rspec/rspec-rails/docs/model-specs).
 
-## Living on edge
+## Controller Specs
 
-Bundler makes it a snap to use the latest code for any gem your app depends on. For
-rspec-rails, you'll need to point bundler to the git repositories for `rspec-rails`
-and the other rspec related gems it depends on:
+Controller specs reside in the `spec/controllers` folder. Use controller specs
+to describe behavior of Rails controllers. For example:
 
 ```ruby
-gem "rspec-rails",        :git => "git://github.com/rspec/rspec-rails.git"
-gem "rspec",              :git => "git://github.com/rspec/rspec.git"
-gem "rspec-core",         :git => "git://github.com/rspec/rspec-core.git"
-gem "rspec-expectations", :git => "git://github.com/rspec/rspec-expectations.git"
-gem "rspec-mocks",        :git => "git://github.com/rspec/rspec-mocks.git"
-```
+require "spec_helper"
 
-Run `bundle install` and you'll have whatever is in git right now. Any time you
-want to update to a newer head, just run `bundle update`.
+describe PostsController do
+  describe "GET #index" do
+    it "responds successfully with an HTTP 200 status code" do
+      get :index
+      expect(response).to be_success
+      expect(response.code).to eq(200)
+    end
 
-Keep in mind that each of these codebases is under active development, which
-means that its entirely possible that you'll pull from these repos and they won't
-play nice together. If playing nice is important to you, stick to the published
-gems.
+    it "renders the index template" do
+      get :index
+      expect(response).to render_template("index")
+    end
 
-## Backwards compatibility
+    it "loads all of the posts into @posts" do
+      post1, post2 = Post.create!, Post.create!
+      get :index
 
-This is a complete rewrite of the rspec-rails extension designed to work with
-rails-3.x and rspec-2.x. It will not work with older versions of either rspec
-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.
+      expect(assigns(:posts)).to match_array([post1, post2])
+    end
+  end
+end
+```
 
-## Known issues
+For more information, see [cucumber scenarios for controller
+specs](https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs).
 
-See http://github.com/rspec/rspec-rails/issues
+**Note:** To encourage more isolated testing, views are not rendered by default
+in controller specs. If you wish to assert against the contents of the rendered
+view in a controller spec, enable
+[render\_views](https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs/render-views)
+or use a higher-level [request spec](#request-specs) or [feature
+spec](#feature-specs).
 
-# Request Specs
+## <a id="request-spec"></a>Request Specs
 
 Request specs live in spec/requests, spec/api and spec/integration, and mix in behavior
 [ActionDispatch::Integration::Runner](http://api.rubyonrails.org/classes/ActionDispatch/Integration/Runner.html),
@@ -159,111 +153,6 @@ 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.
 
-# Controller Specs
-
-Controller specs live in spec/controllers, and mix in
-ActionController::TestCase::Behavior, which is the basis for Rails' functional
-tests.
-
-## with fixtures
-
-```ruby
-require 'spec_helper'
-describe WidgetsController do
-  describe "GET index" do
-    fixtures :widgets
-
-    it "assigns all widgets to @widgets" do
-      get :index
-      expect(assigns(:widgets)).to eq(Widget.all)
-    end
-  end
-end
-```
-
-## with a factory
-
-```ruby
-require 'spec_helper'
-describe WidgetsController do
-  describe "GET index" do
-    it "assigns all widgets to @widgets" do
-      widget = FactoryGirl.create(:widget)
-      get :index
-      expect(assigns(:widgets)).to eq([widget])
-    end
-  end
-end
-```
-
-## with stubs
-
-```ruby
-require 'spec_helper'
-describe WidgetsController do
-  describe "GET index" do
-    it "assigns all widgets to @widgets" do
-      widget = stub_model(Widget)
-      Widget.stub(:all) { [widget] }
-      get :index
-      expect(assigns(:widgets)).to eq([widget])
-    end
-  end
-end
-```
-
-## matchers
-
-In addition to the stock matchers from rspec-expectations, controller
-specs add these matchers, which delegate to rails' assertions:
-
-```ruby
-expect(response).to render_template(*args)
-# => delegates to assert_template(*args)
-
-expect(response).to redirect_to(destination)
-# => delegates to assert_redirected_to(destination)
-```
-
-## isolation from views
-
-RSpec's preferred approach to spec'ing controller behaviour is to isolate
-the controller from its collaborators.  By default, therefore, controller
-example groups do not render the views in your app. Due to the way Rails
-searches for view templates, the template still needs to exist, but it
-won't actually be loaded.
-
-NOTE that this is different from rspec-rails-1 with rails-2, which did not
-require the presence of the file at all. Due to changes in rails-3, this
-was no longer feasible in rspec-rails-2.
-
-## `render_views`
-
-If you prefer a more integrated approach, similar to that of Rails'
-functional tests, you can tell controller groups to render the views in the
-app with the `render_views` declaration:
-
-```ruby
-require 'spec_helper'
-describe WidgetsController do
-  render_views
-  # ...
-```
-
-### Upgrade note
-
-`render_views` replaces `integrate_views` from rspec-rails-1.3
-
-## `assigns`
-
-Use `assigns(key)` to express expectations about instance variables that a controller
-assigns to the view in the course of an action:
-
-```ruby
-get :index
-expect(assigns(:widgets)).to eq(expected_value)
-```
-
 # View specs
 
 View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
@@ -369,32 +258,6 @@ render
 expect(rendered).to xxx
 ```
 
-# Model specs
-
-Model specs live in spec/models.
-
-```ruby
-require 'spec_helper'
-describe Article do
-  describe ".recent" do
-    it "includes articles published less than one week ago" do
-      article = Article.create!(:published_at => Date.today - 1.week + 1.second)
-      expect(Article.recent).to eq([article])
-    end
-
-    it "excludes articles published at midnight one week ago" do
-      article = Article.create!(:published_at => Date.today - 1.week)
-      expect(Article.recent).to be_empty
-    end
-
-    it "excludes articles published more than one week ago" do
-      article = Article.create!(:published_at => Date.today - 1.week - 1.second)
-      expect(Article.recent).to be_empty
-    end
-  end
-end
-```
-
 # Routing specs
 
 Routing specs live in spec/routing.
@@ -518,6 +381,21 @@ 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).
@@ -531,3 +409,7 @@ For `rspec-rails`-specific development information, see
 * [http://github.com/rspec/rspec-core](http://github.com/rspec/rspec-core)
 * [http://github.com/rspec/rspec-expectations](http://github.com/rspec/rspec-expectations)
 * [http://github.com/rspec/rspec-mocks](http://github.com/rspec/rspec-mocks)
+
+## Feature Requests & Bugs
+
+See <http://github.com/rspec/rspec-rails/issues>

data/features/controller_specs/anonymous_controller.feature

@@ -351,3 +351,28 @@ Feature: anonymous controller
     """
     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"
+
+    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
+        end
+      end
+
+      it "redirects to the login page" do
+        get :index
+        expect(response).to redirect_to("/login")
+      end
+    end
+    """
+    When I run `rspec spec`
+    Then the examples should all pass

data/features/model_specs/README.md

@@ -11,11 +11,11 @@ behavior and expectations.
     
     describe Post do
       context "with 2 or more comments" do
-        it "orders them in reverse" do
-          post = Post.create
-          comment1 = post.comment("first")
-          comment2 = post.comment("second")
-          post.reload.comments.should eq([comment2, comment1])
+        it "orders them in reverse chronologically" do
+          post = Post.create!
+          comment1 = post.comments.create!(:body => "first comment")
+          comment2 = post.comments.create!(:body => "second comment")
+          expect(post.reload.comments).to eq([comment2, comment1])
         end
       end
     end

data/lib/generators/rspec/install/templates/spec/{spec_helper.rb → spec_helper.rb.tt}

@@ -8,6 +8,12 @@ require 'rspec/autorun'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
+<% if ::Rails.version >= '4' -%>
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+
+<% end -%>
 RSpec.configure do |config|
   # ## Mock Framework
   #

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

@@ -113,7 +113,11 @@ describe <%= controller_class_name %>Controller do
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
+        <%- if Rails.version >= '4' -%>
+        <%= class_name %>.any_instance.should_receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
+        <%- else -%>
         <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
+        <%- end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
       end
 

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

@@ -21,9 +21,9 @@ describe "<%= ns_table_name %>/edit" do
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post" do
+    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
 <% end -%>
     end
 <% end -%>

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

@@ -20,9 +20,9 @@ describe "<%= ns_table_name %>/new" do
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => <%= index_helper %>_path, :method => "post" do
+    assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
 <% end -%>
     end
 <% end -%>

data/lib/rspec/rails/matchers.rb

@@ -24,3 +24,4 @@ require 'rspec/rails/matchers/be_new_record'
 require 'rspec/rails/matchers/be_a_new'
 require 'rspec/rails/matchers/have_extension'
 require 'rspec/rails/matchers/relation_match_array'
+require 'rspec/rails/matchers/be_valid'

data/lib/rspec/rails/matchers/be_valid.rb

@@ -0,0 +1,40 @@
+module RSpec::Rails::Matchers
+  class BeValid < RSpec::Matchers::BuiltIn::Be
+    def initialize(*args)
+      @args = args
+    end
+
+    # @api private
+    def matches?(actual)
+      @actual = actual
+      actual.valid?(*@args)
+    end
+
+    # @api private
+    def failure_message_for_should
+      message = "expected #{actual.inspect} to be valid"
+      if actual.respond_to?(:errors)
+        message << ", but got errors: #{actual.errors.full_messages.join(', ')}"
+      end
+
+      message
+    end
+
+    # @api private
+    def failure_message_for_should_not
+      "expected #{actual.inspect} not to be valid"
+    end
+  end
+
+  # Passes if the given model instance's `valid?` method is true, meaning all
+  # of the `ActiveModel::Validations` passed and no errors exist. If a message
+  # is not given, a default message is shown listing each error.
+  #
+  # @example
+  #
+  #     thing = Thing.new
+  #     thing.should be_valid
+  def be_valid(*args)
+    BeValid.new(*args)
+  end
+end

data/lib/rspec/rails/mocks.rb

@@ -104,7 +104,7 @@ EOM
             include ActiveModel::Validations
           end
           if defined?(ActiveRecord)
-            [:save, :update_attributes].each do |key|
+            [:save, :update_attributes, :update].each do |key|
               if stubs[key] == false
                 m.errors.stub(:empty? => false)
               end

data/lib/rspec/rails/tasks/rspec.rake

@@ -3,12 +3,7 @@ if default = Rake.application.instance_variable_get('@tasks')['default']
   default.prerequisites.delete('test')
 end
 
-orm_setting = Rails.configuration.generators.options[:rails][:orm]
-spec_prereq = if(orm_setting == :active_record)
-  Rails.configuration.active_record[:schema_format] == :sql ? "db:test:clone_structure" : "db:test:prepare"
-else
-  :noop
-end
+spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "test:prepare" : :noop
 task :noop do; end
 task :default => :spec
 
@@ -18,10 +13,15 @@ desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
 namespace :spec do
-  [:requests, :models, :controllers, :views, :helpers, :mailers, :lib, :routing].each do |sub|
-    desc "Run the code examples in spec/#{sub}"
-    RSpec::Core::RakeTask.new(sub => spec_prereq) do |t|
-      t.pattern = "./spec/#{sub}/**/*_spec.rb"
+  def types
+    dirs = Dir['./spec/**/*_spec.rb'].map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }.uniq
+    Hash[dirs.map { |d| [d.split('/').last, d] }]
+  end
+
+  types.each do |type, dir|
+    desc "Run the code examples in #{dir}"
+    RSpec::Core::RakeTask.new(type => spec_prereq) do |t|
+      t.pattern = "./#{dir}/**/*_spec.rb"
     end
   end
 
@@ -34,22 +34,12 @@ namespace :spec do
 
   task :statsetup do
     require 'rails/code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-    ::STATS_DIRECTORIES << %w(Mailer\ specs spec/mailers) if File.exist?('spec/mailers')
-    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-    ::STATS_DIRECTORIES << %w(Request\ specs spec/requests) if File.exist?('spec/requests')
-    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailers')
-    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-    ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
+    types.each do |type, dir|
+      name = type.singularize.capitalize
+
+      ::STATS_DIRECTORIES << ["#{name} specs", dir]
+      ::CodeStatistics::TEST_TYPES << "#{name} specs"
+    end
   end
 end
 

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.12.2'
+      STRING = '2.13.0'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -73,7 +73,7 @@ module RSpec
             ::ActionView::Template.new(
               "",
               template.identifier,
-              template.handler,
+              EmptyTemplateHandler,
               {
                 :virtual_path => template.virtual_path,
                 :format => template.formats
@@ -83,6 +83,12 @@ module RSpec
         end
       end
 
+      class EmptyTemplateHandler
+        def self.call(template)
+          %("")
+        end
+      end
+
       module EmptyTemplates
         # @api private
         def prepend_view_path(new_path)

data/spec/generators/rspec/install/install_generator_spec.rb

@@ -15,4 +15,16 @@ describe Rspec::Generators::InstallGenerator do
     run_generator
     File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/autorun'$/m
   end
+
+  if ::Rails.version >= '4'
+    it "generates spec/spec_helper.rb with a check for pending migrations" do
+      run_generator
+      File.read( file('spec/spec_helper.rb') ).should =~ /ActiveRecord::Migration\.check_pending!/m
+    end
+  else
+    it "generates spec/spec_helper.rb without a check for pending migrations" do
+      run_generator
+      File.read( file('spec/spec_helper.rb') ).should_not =~ /ActiveRecord::Migration\.check_pending!/m
+    end
+  end
 end

data/spec/rspec/rails/example/feature_example_group_spec.rb

@@ -5,12 +5,12 @@ module RSpec::Rails
     it { should be_included_in_files_in('./spec/features/') }
     it { should be_included_in_files_in('.\\spec\\features\\') }
 
-    it "adds :type => :model to the metadata" do
+    it "adds :type => :feature to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include FeatureExampleGroup
       end
 
-      expect(group.metadata[:type]).to eql(:feature)
+      expect(group.metadata[:type]).to eq(:feature)
     end
 
     it "includes Rails route helpers" do
@@ -22,8 +22,8 @@ module RSpec::Rails
         include FeatureExampleGroup
       end
 
-      expect(group.new.foo_path).to eql("/foo")
-      expect(group.new.foo_url).to eql("http://www.example.com/foo")
+      expect(group.new.foo_path).to eq("/foo")
+      expect(group.new.foo_url).to eq("http://www.example.com/foo")
     end
 
     describe "#visit" do
@@ -49,7 +49,7 @@ module RSpec::Rails
           include FeatureExampleGroup
         end
 
-        expect(group.new.visit("/foo")).to eql("success: /foo")
+        expect(group.new.visit("/foo")).to eq("success: /foo")
       end
     end
   end

data/spec/rspec/rails/matchers/be_valid_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require 'active_support/all'
+require 'rspec/rails/matchers/be_valid'
+
+describe "be_valid matcher" do
+  include RSpec::Rails::Matchers
+
+  class Post
+    include ActiveModel::Validations
+    attr_accessor :title
+    validates_presence_of :title
+  end
+
+  let(:post) { Post.new }
+
+  it "includes the error messages in the failure message" do
+    expect {
+      expect(post).to be_valid
+    }.to raise_exception(/Title can't be blank/)
+  end
+
+  it "includes a failure message for the negative case" do
+    post.stub(:valid?) { true }
+    expect {
+      expect(post).not_to be_valid
+    }.to raise_exception(/expected .* not to be valid/)
+  end
+
+  it "uses a custom failure message if provided" do
+    expect {
+      expect(post).to be_valid, "Post was not valid!"
+    }.to raise_exception(/Post was not valid!/)
+  end
+
+  it "includes the validation context if provided" do
+    post.should_receive(:valid?).with(:create) { true }
+    expect(post).to be_valid(:create)
+  end
+
+  it "does not include the validation context if not provided" do
+    post.should_receive(:valid?).with(no_args) { true }
+    expect(post).to be_valid
+  end
+end

data/spec/rspec/rails/mocks/stub_model_spec.rb

@@ -112,7 +112,7 @@ describe "stub_model" do
 
     describe "alternate primary key" do
       it "has the correct primary_key name" do
-        stub_model(AlternatePrimaryKeyModel).class.primary_key.to_s.should eql('my_id')
+        stub_model(AlternatePrimaryKeyModel).class.primary_key.to_s.should eq('my_id')
       end
 
       it "has a primary_key" do

metadata

@@ -2,206 +2,206 @@
 name: rspec-rails
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.12.2
+  version: 2.13.0
 platform: ruby
 authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: actionpack
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: railties
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec-core
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+        version: 2.13.0
     none: false
+  prerelease: false
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  prerelease: false
+        version: 2.13.0
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+        version: 2.13.0
     none: false
+  prerelease: false
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  prerelease: false
+        version: 2.13.0
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+        version: 2.13.0
     none: false
+  prerelease: false
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  prerelease: false
+        version: 2.13.0
+    none: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-  prerelease: false
+    none: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: cucumber
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-  prerelease: false
+    none: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: aruba
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.11
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.11
-  prerelease: false
+    none: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: ZenTest
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.6.2
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.6.2
-  prerelease: false
+    none: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: ammeter
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.5
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: ammeter
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.5
-  prerelease: false
+    none: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: capybara
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.beta4
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.beta4
-  prerelease: false
+    none: false
   type: :development
 description: RSpec for Rails
 email: rspec-users@rubyforge.org
@@ -218,7 +218,7 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/.rspec
-- lib/generators/rspec/install/templates/spec/spec_helper.rb
+- lib/generators/rspec/install/templates/spec/spec_helper.rb.tt
 - lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/integration/templates/request_spec.rb
 - lib/generators/rspec/mailer/mailer_generator.rb
@@ -258,6 +258,7 @@ files:
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/matchers/be_a_new.rb
 - lib/rspec/rails/matchers/be_new_record.rb
+- lib/rspec/rails/matchers/be_valid.rb
 - lib/rspec/rails/matchers/have_extension.rb
 - lib/rspec/rails/matchers/have_rendered.rb
 - lib/rspec/rails/matchers/redirect_to.rb
@@ -344,6 +345,7 @@ files:
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/be_new_record_spec.rb
 - spec/rspec/rails/matchers/be_routable_spec.rb
+- spec/rspec/rails/matchers/be_valid_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/has_spec.rb
 - spec/rspec/rails/matchers/have_rendered_spec.rb
@@ -367,29 +369,29 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: 1572351758875073422
       segments:
       - 0
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 643908547844668422
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: 1572351758875073422
       segments:
       - 0
+      hash: 643908547844668422
+  none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.12.2
+summary: rspec-rails-2.13.0
 test_files:
 - features/Autotest.md
 - features/Generators.md
@@ -458,6 +460,7 @@ test_files:
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/be_new_record_spec.rb
 - spec/rspec/rails/matchers/be_routable_spec.rb
+- spec/rspec/rails/matchers/be_valid_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/has_spec.rb
 - spec/rspec/rails/matchers/have_rendered_spec.rb