rspec-rails 2.8.1 → 2.9.0.rc2

data/.document

@@ -0,0 +1,5 @@
+README.markdown
+lib/**/*.rb
+bin/*
+features/**/*.feature
+License.txt

data/.yardopts

@@ -0,0 +1,9 @@
+--no-private
+--exclude features
+--exclude lib/generators/**/*_spec.rb
+--markup markdown
+--template-path yard/template/
+-
+README.md
+Changelog.md
+License.txt

data/Changelog.md

@@ -0,0 +1,250 @@
+### 2.9.0.rc2 / 2012-03-12
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.1...v2.9.0.rc2)
+
+Enhancments
+* add description method to RouteToMatcher (John Wulff)
+* Run "db:test:clone_structure" instead of "db:test:prepare" if Active Record's
+  schema format is ":sql". (Andrey Voronkov)
+
+Bug fixes
+* mock_model(XXX).as_null_object.unknown_method returns self again
+* Generated view specs use different IDs for each attribute.
+
+### 2.8.1 / 2012-01-04
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0...v2.8.1)
+
+NOTE: there was a change in rails-3.2.0.rc2 which broke compatibility with
+stub_model in rspec-rails. This release fixes that issue, but it means that
+you'll have to upgrade to rspec-rails-2.8.1 when you upgrade to rails >=
+3.2.0.rc2.
+
+* Bug fixes
+    * Explicitly stub valid? in stub_model. Fixes stub_model for rails versions
+      >= 3.2.0.rc2.
+
+### 2.8.0 / 2012-01-04
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.8.0.rc2...v2.8.0)
+
+* Enhancements
+    * Eliminate deprecation warnings in generated view specs in Rails 3.2
+    * Ensure namespaced helpers are included automatically (Evgeniy Dolzhenko)
+    * Added cuke scenario documenting which routes are generated for anonymous
+      controllers (Alan Shields)
+
+### 2.8.0.rc2 / 2011-12-19
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
+
+* Enhancements
+    * Add session hash to generated controller specs (Thiago Almeida)
+    * Eliminate deprecation warnings about InstanceMethods modules in Rails 3.2
+
+* Bug fixes
+    * Stub attribute accessor after `respond_to?` call on mocked model (Igor
+      Afonov)
+
+### 2.8.0.rc1 / 2011-11-06
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.7.0...v2.8.0.rc1)
+
+* Enhancements
+    * Removed unnecessary "config.mock_with :rspec" from spec_helper.rb (Paul
+      Annesley)
+
+* Changes
+    * No API changes for rspec-rails in this release, but some internals
+      changed to align with rspec-core-2.8
+
+* [rspec-core](https://github.com/rspec/rspec-core/blob/master/Changelog.md)
+* [rspec-expectations](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
+* [rspec-mocks](https://github.com/rspec/rspec-mocks/blob/master/Changelog.md)
+
+### 2.7.0 / 2011-10-16
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.1...v2.7.0)
+
+* Enhancments
+  * `ActiveRecord::Relation` can use the `=~` matcher (Andy Lindeman)
+  * Make generated controller spec more consistent with regard to ids
+    (Brent J. Nordquist)
+  * Less restrictive autotest mapping between spec and implementation files
+    (José Valim)
+  * `require 'rspec/autorun'` from generated `spec_helper.rb` (David Chelimsky)
+  * add `bypass_rescue` (Lenny Marks)
+  * `route_to` accepts query string (Marc Weil)
+
+* Internal
+  * Added specs for generators using ammeter (Alex Rothenberg)
+
+* Bug fixes
+  * Fix configuration/integration bug with rails 3.0 (fixed in 3.1) in which
+    `fixure_file_upload` reads from `ActiveSupport::TestCase.fixture_path` and
+    misses RSpec's configuration (David Chelimsky)
+  * Support nested resource in view spec generator (David Chelimsky)
+  * Define `primary_key` on class generated by `mock_model("WithAString")`
+    (David Chelimsky)
+
+### 2.6.1 / 2011-05-25
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1)
+
+This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
+
+* Bug fixes
+  * fix controller specs with anonymous controllers with around filters
+  * exclude spec directory from rcov metrics (Rodrigo Navarro)
+  * guard against calling prerequisites on nil default rake task (Jack Dempsey)
+
+### 2.6.0 / 2011-05-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0)
+
+* Enhancements
+  * rails 3 shortcuts for routing specs (Joe Fiorini)
+  * support nested resources in generators (Tim McEwan)
+  * require 'rspec/rails/mocks' to use `mock_model` without requiring the whole
+    rails framework
+  * Update the controller spec generated by the rails scaffold generator:
+    * Add documentation to the generated spec
+    * Use `any_instance` to avoid stubbing finders
+    * Use real objects instead of `mock_model`
+  * Update capybara integration to work with capy 0.4 and 1.0.0.beta
+  * Decorate paths passed to `[append|prepend]_view_paths` with empty templates
+    unless rendering views. (Mark Turner)
+
+* Bug fixes
+  * fix typo in "rake spec:statsetup" (Curtis Schofield)
+  * expose named routes in anonymous controller specs (Andy Lindeman)
+  * error when generating namespaced scaffold resources (Andy Lindeman)
+  * Fix load order issue w/ Capybara (oleg dashevskii)
+  * Fix monkey patches that broke due to internal changes in rails-3.1.0.beta1
+
+### 2.5.0 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.1...v2.5.0)
+
+* Enhancements
+  * use index_helper instead of table_name when generating specs (Reza
+    Primardiansyah)
+
+* Bug fixes
+  * fixed bug in which `render_views` in a nested group set the value in its
+    parent group.
+  * only include MailerExampleGroup when it is defined (Steve Sloan)
+  * mock_model.as_null_object.attribute.blank? returns false (Randy Schmidt)
+  * fix typo in request specs (Paco Guzman)
+
+### 2.4.1 / 2011-01-03
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...v2.4.1)
+
+* Bug fixes
+  * fixed bug caused by including some Rails modules before RSpec's
+    RailsExampleGroup
+
+### 2.4.0 / 2011-01-02
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...v2.4.0)
+
+* Enhancements
+  * include ApplicationHelper in helper object in helper specs
+  * include request spec extensions in files in spec/integration
+  * include controller spec extensions in groups that use :type => :controller
+    * same for :model, :view, :helper, :mailer, :request, :routing
+
+* Bug fixes
+  * restore global config.render_views so you only need to say it once
+  * support overriding render_views in nested groups
+  * matchers that delegate to Rails' assertions capture
+    ActiveSupport::TestCase::Assertion (so they work properly now with
+    should_not in Ruby 1.8.7 and 1.9.1)
+
+* Deprecations
+  * include_self_when_dir_matches
+
+### 2.3.1 / 2010-12-16
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.0...v2.3.1)
+
+* Bug fixes
+  * respond_to? correctly handles 2 args
+  * scaffold generator no longer fails on autotest directory
+
+### 2.3.0 / 2010-12-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
+
+* Changes
+  * Generator no longer generates autotest/autodiscover.rb, as it is no longer
+    needed (as of rspec-core-2.3.0)
+
+### 2.2.1 / 2010-12-01
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
+
+* Bug fixes
+  * Depend on railties, activesupport, and actionpack instead of rails (Piotr
+    Solnica)
+  * Got webrat integration working properly across different types of specs
+
+* Deprecations
+  * --webrat-matchers flag for generators is deprecated. use --webrat instead.
+
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
+
+* Enhancements
+  * Added stub_template in view specs
+
+* Bug fixes
+  * Properly include helpers in views (Jonathan del Strother)
+  * Fix bug in which method missing led to a stack overflow
+  * Fix stack overflow in request specs with open_session
+  * Fix stack overflow in any spec when method_missing was invoked
+  * Add gem dependency on rails ~> 3.0.0 (ensures bundler won't install
+    rspec-rails-2 with rails-2 apps).
+
+### 2.1.0 / 2010-11-07
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
+
+* Enhancements
+  * Move errors_on to ActiveModel to support other AM-compliant ORMs
+
+* Bug fixes
+  * Check for presence of ActiveRecord instead of checking Rails config
+    (gets rspec out of the way of multiple ORMs in the same app)
+
+### 2.0.1 / 2010-10-15
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
+
+* Enhancements
+  * Add option to not generate request spec (--skip-request-specs)
+
+* Bug fixes
+  * Updated the mock_[model] method generated in controller specs so it adds
+    any stubs submitted each time it is called.
+  * Fixed bug where view assigns weren't making it to the view in view specs in Rails-3.0.1.
+    (Emanuele Vicentini)
+
+### 2.0.0 / 2010-10-10
+
+[full changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
+
+* Enhancements
+  * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)
+  * autotest mapping improvements (Andreas Neuhaus)
+  * more cucumber features (Justin Ko)
+  * clean up spec helper (Andre Arko)
+  * add assign(name, value) to helper specs (Justin Ko)
+  * stub_model supports primary keys other than id (Justin Ko)
+  * support choice between Webrat/Capybara (Justin Ko)
+  * support specs for 'abstract' subclasses of ActionController::Base (Mike Gehard)
+  * be_a_new matcher supports args (Justin Ko)
+
+* Bug fixes
+  * support T::U components in mailer and request specs (Brasten Sager)

data/README.md

@@ -109,7 +109,7 @@ a black box approach.
 
 ```ruby
 describe "home page" do
-  it "diplays the user's username after successful login" do
+  it "displays the user's username after successful login" do
     user = User.create!(:username => "jdoe", :password => "secret")
     get "/login"
     assert_select "form.login" do
@@ -129,14 +129,14 @@ users like to use extension libraries like FactoryGirl and Capybara:
 
 ```ruby
 describe "home page" do
-  it "diplays the user's username after successful login" do
+  it "displays the user's username after successful login" do
     user = Factory(:user, :username => "jdoe", :password => "secret")
     visit "/login"
     fill_in "Username", :with => "jdoe"
     fill_in "Password", :with => "secret"
-    click_buton "Log in"
+    click_button "Log in"
 
-    page.should have_selector(".header .username", :content => "jdoe")
+    page.should have_selector(".header .username", :text => "jdoe")
   end
 end
 ```
@@ -260,7 +260,7 @@ assigns(:widgets).should eq(expected_value)
 View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
 
 ```ruby
-describe "events/index.html.erb" do
+describe "events/index" do
   it "renders _event partial for each event" do
     assign(:events, [stub_model(Event), stub_model(Event)])
     render
@@ -268,7 +268,7 @@ describe "events/index.html.erb" do
   end
 end
 
-describe "events/show.html.erb" do
+describe "events/show" do
   it "displays the event location" do
     assign(:event, stub_model(Event,
       :location => "Chicago"

data/features/support/env.rb

@@ -9,7 +9,7 @@ end
 World(ArubaExt)
 
 Before do
-  @aruba_timeout_seconds = 15
+  @aruba_timeout_seconds = 30
 end
 
 unless File.directory?('./tmp/example_app')

data/features/view_specs/inferred_controller_path.feature

@@ -5,7 +5,7 @@ Feature: view spec infers controller path and action
       """
       require "spec_helper"
 
-      describe "widgets/new.html.erb" do
+      describe "widgets/new" do
         it "infers the controller path" do
           controller.request.path_parameters["controller"].should eq("widgets")
         end
@@ -19,7 +19,7 @@ Feature: view spec infers controller path and action
       """
       require "spec_helper"
 
-      describe "widgets/new.html.erb" do
+      describe "widgets/new" do
         it "infers the controller path" do
           controller.request.path_parameters["action"].should eq("new")
         end
@@ -33,7 +33,7 @@ Feature: view spec infers controller path and action
       """
       require "spec_helper"
 
-      describe "widgets/_form.html.erb" do
+      describe "widgets/_form" do
         it "includes a link to new" do
           controller.request.path_parameters["action"].should be_nil
         end

data/features/view_specs/stub_template.feature

@@ -8,7 +8,7 @@ Feature: stub template
       """
       require "spec_helper"
 
-      describe "gadgets/list.html.erb" do
+      describe "gadgets/list" do
         it "renders the gadget partial for each gadget" do
           assign(:gadgets, [
             mock_model(Gadget, :id => 1, :name => "First"),
@@ -34,7 +34,7 @@ Feature: stub template
       """
       require "spec_helper"
 
-      describe "gadgets/edit.html.erb" do
+      describe "gadgets/edit" do
         before(:each) do
           @gadget = assign(:gadget, stub_model(Gadget))
         end

data/features/view_specs/view_spec.feature

@@ -7,7 +7,7 @@ Feature: view spec
       """
       require "spec_helper"
 
-      describe "widgets/index.html.erb" do
+      describe "widgets/index" do
         it "displays all the widgets" do
           assign(:widgets, [
             stub_model(Widget, :name => "slicer"),
@@ -29,7 +29,7 @@ Feature: view spec
       """
       require "spec_helper"
 
-      describe "widgets/index.html.erb" do
+      describe "widgets/index" do
 
         context "with 2 widgets" do
           before(:each) do
@@ -145,7 +145,7 @@ Feature: view spec
       """
       require 'spec_helper'
 
-      describe 'secrets/index.html.erb' do
+      describe 'secrets/index' do
         before do
           view.stub(:admin?).and_return(true)
         end

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

@@ -146,6 +146,9 @@ module Rspec
           case attribute.type
           when :string
             "#{attribute.name.titleize}".inspect
+          when :integer
+            @attribute_id_map ||= {}
+            @attribute_id_map[attribute] ||= @attribute_id_map.keys.size.next.to_s
           else
             attribute.default.inspect
           end

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

@@ -18,11 +18,13 @@ describe "<%= ns_table_name %>/index" do
 
   it "renders a list of <%= ns_table_name %>" do
     render
+<% unless webrat? -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+<% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
     rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
 <% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
 <% end -%>
 <% end -%>

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

@@ -14,11 +14,13 @@ describe "<%= ns_table_name %>/show" do
 
   it "renders attributes in <p>" do
     render
+<% unless webrat? -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+<% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
     rendered.should contain(<%= value_for(attribute) %>.to_s)
 <% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     rendered.should match(/<%= eval(value_for(attribute)) %>/)
 <% end -%>
 <% end -%>

data/lib/rspec/rails/example/view_example_group.rb

@@ -122,7 +122,7 @@ module RSpec::Rails
       include ExampleMethods
 
       metadata[:type] = :view
-      helper *_default_helpers
+      helper(*_default_helpers)
 
       before do
         _include_controller_helpers

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

@@ -1,6 +1,6 @@
 module RSpec::Rails::Matchers
   class BeANew
-    include RSpec::Matchers::BaseMatcher
+    include RSpec::Matchers::BuiltIn::BaseMatcher
 
     # @api private
     def matches?(actual)

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

@@ -1,6 +1,6 @@
 module RSpec::Rails::Matchers
   class BeANewRecord
-    include RSpec::Matchers::BaseMatcher
+    include RSpec::Matchers::BuiltIn::BaseMatcher
 
     # @api private
     def matches?(actual)

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

@@ -1,5 +1,5 @@
 require 'active_support/core_ext/module/aliasing'
-require 'rspec/matchers/have'
+require 'rspec/matchers/built_in/have'
 
 module RSpec::Rails::Matchers
   module HaveExtensions
@@ -30,6 +30,6 @@ module RSpec::Rails::Matchers
   end
 end
 
-RSpec::Matchers::Have.class_eval do
+RSpec::Matchers::BuiltIn::Have.class_eval do
   include RSpec::Rails::Matchers::HaveExtensions
 end

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

@@ -1,7 +1,7 @@
 module RSpec::Rails::Matchers
   module RedirectTo
     class RedirectTo
-      include RSpec::Matchers::BaseMatcher
+      include RSpec::Matchers::BuiltIn::BaseMatcher
 
       def initialize(scope, expected)
         super(expected)

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

@@ -1,3 +1,3 @@
 if defined?(ActiveRecord::Relation)
-  RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::MatchArray)
+  RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
 end

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

@@ -1,7 +1,7 @@
 module RSpec::Rails::Matchers
   module RenderTemplate
     class RenderTemplateMatcher
-      include RSpec::Matchers::BaseMatcher
+      include RSpec::Matchers::BuiltIn::BaseMatcher
 
       def initialize(scope, expected, message=nil)
         super(Symbol === expected ? expected.to_s : expected)

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

@@ -3,7 +3,7 @@ module RSpec::Rails::Matchers
     extend RSpec::Matchers::DSL
 
     class RouteToMatcher
-      include RSpec::Matchers::BaseMatcher
+      include RSpec::Matchers::BuiltIn::BaseMatcher
 
       def initialize(scope, *expected)
         @scope = scope
@@ -15,9 +15,14 @@ module RSpec::Rails::Matchers
           @expected_options.merge!(:controller => controller, :action => action)
         end
       end
+      
+      def description
+        "route #{@verb_to_path_map.inspect} to #{@expected_options.inspect}"
+      end
 
       # @api private
       def matches?(verb_to_path_map)
+        @verb_to_path_map = verb_to_path_map
         match_unless_raises ActiveSupport::TestCase::Assertion do
           path, query = *verb_to_path_map.values.first.split('?')
           @scope.assert_recognizes(
@@ -52,7 +57,7 @@ module RSpec::Rails::Matchers
     end
 
     class BeRoutableMatcher
-      include RSpec::Matchers::BaseMatcher
+      include RSpec::Matchers::BuiltIn::BaseMatcher
 
       def initialize(scope)
         @scope = scope

data/lib/rspec/rails/mocks.rb

@@ -132,7 +132,7 @@ EOM
             end unless #{stubs.has_key?(:respond_to?)}
             
             def @object.method_missing(m, *a, &b)
-              respond_to?(m) ? nil : super
+              respond_to?(m) ? null_object? ? self : nil : super
             end
 
             def @object.class

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

@@ -4,7 +4,12 @@ if default = Rake.application.instance_variable_get('@tasks')['default']
   default.prerequisites.delete('test')
 end
 
-spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "db:test:prepare" : :noop
+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
 task :noop do; end
 task :default => :spec
 

data/lib/rspec/rails/vendor/webrat.rb

@@ -23,11 +23,11 @@ RSpec.configure do |c|
     c.include RequestInstanceMethods, :type => :request
 
     c.before :type => :controller do
-      Webrat.configure {|c| c.mode = :rails}
+      Webrat.configure {|w| w.mode = :rails}
     end
 
     c.before :type => :request do
-      Webrat.configure {|c| c.mode = :rack}
+      Webrat.configure {|w| w.mode = :rack}
     end
   end
 end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.8.1'
+      STRING = '2.9.0.rc2'
     end
   end
 end

data/spec/generators/rspec/controller/controller_generator_spec.rb

@@ -18,8 +18,8 @@ describe Rspec::Generators::ControllerGenerator do
 
       describe 'the spec' do
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe PostsController/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe PostsController/) }
       end
     end
     describe 'skipped with a flag' do
@@ -60,14 +60,14 @@ describe Rspec::Generators::ControllerGenerator do
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
           it { should exist }
-          it { should contain /require 'spec_helper'/ }
-          it { should contain /describe "posts\/index.html.erb"/ }
+          it { should contain(/require 'spec_helper'/) }
+          it { should contain(/describe "posts\/index.html.erb"/) }
         end
         describe 'show.html.erb' do
           subject { file('spec/views/posts/show.html.erb_spec.rb') }
           it { should exist }
-          it { should contain /require 'spec_helper'/ }
-          it { should contain /describe "posts\/show.html.erb"/ }
+          it { should contain(/require 'spec_helper'/) }
+          it { should contain(/describe "posts\/show.html.erb"/) }
         end
       end
       describe 'with haml' do
@@ -77,8 +77,8 @@ describe Rspec::Generators::ControllerGenerator do
         describe 'index.html.haml' do
           subject { file('spec/views/posts/index.html.haml_spec.rb') }
           it { should exist }
-          it { should contain /require 'spec_helper'/ }
-          it { should contain /describe "posts\/index.html.haml"/ }
+          it { should contain(/require 'spec_helper'/) }
+          it { should contain(/describe "posts\/index.html.haml"/) }
         end
       end
     end

data/spec/generators/rspec/helper/helper_generator_spec.rb

@@ -17,8 +17,8 @@ describe Rspec::Generators::HelperGenerator do
 
     describe 'the spec' do
       it { should exist }
-      it { should contain /require 'spec_helper'/ }
-      it { should contain /describe PostsHelper/ }
+      it { should contain(/require 'spec_helper'/) }
+      it { should contain(/describe PostsHelper/) }
     end
   end
   describe 'skipped with a flag' do

data/spec/generators/rspec/integration/integration_generator_spec.rb

@@ -26,9 +26,9 @@ describe Rspec::Generators::IntegrationGenerator do
       end
       subject { file('spec/requests/posts_spec.rb') }
       it { should exist }
-      it { should contain /require 'spec_helper'/ }
-      it { should contain /describe "GET \/posts"/ }
-      it { should contain /get posts_index_path/ }
+      it { should contain(/require 'spec_helper'/) }
+      it { should contain(/describe "GET \/posts"/) }
+      it { should contain(/get posts_index_path/) }
     end
     describe 'with webrat matchers' do
       before do
@@ -36,9 +36,9 @@ describe Rspec::Generators::IntegrationGenerator do
       end
       subject { file('spec/requests/posts_spec.rb') }
       it { should exist }
-      it { should contain /require 'spec_helper'/ }
-      it { should contain /describe "GET \/posts"/ }
-      it { should contain /visit posts_index_path/ }
+      it { should contain(/require 'spec_helper'/) }
+      it { should contain(/describe "GET \/posts"/) }
+      it { should contain(/visit posts_index_path/) }
     end
   end
 end

data/spec/generators/rspec/mailer/mailer_generator_spec.rb

@@ -16,17 +16,17 @@ describe Rspec::Generators::MailerGenerator do
         run_generator %w(posts index show)
       end
       it { should exist }
-      it { should contain /require "spec_helper"/ }
-      it { should contain /describe "index" do/ }
-      it { should contain /describe "show" do/ }
+      it { should contain(/require "spec_helper"/) }
+      it { should contain(/describe "index" do/) }
+      it { should contain(/describe "show" do/) }
     end
     describe 'creates placeholder when no actions specified' do
       before do
         run_generator %w(posts)
       end
       it { should exist }
-      it { should contain /require "spec_helper"/ }
-      it { should contain /pending "add some examples to \(or delete\)/ }
+      it { should contain(/require "spec_helper"/) }
+      it { should contain(/pending "add some examples to \(or delete\)/) }
     end
   end
 
@@ -37,12 +37,12 @@ describe Rspec::Generators::MailerGenerator do
     describe 'index' do
       subject { file('spec/fixtures/posts/index') }
       it { should exist }
-      it { should contain /Posts#index/ }
+      it { should contain(/Posts#index/) }
     end
     describe 'show' do
       subject { file('spec/fixtures/posts/show') }
       it { should exist }
-      it { should contain /Posts#show/ }
+      it { should contain(/Posts#show/) }
     end
   end
 end

data/spec/generators/rspec/model/model_generator_spec.rb

@@ -26,14 +26,14 @@ describe Rspec::Generators::ModelGenerator do
         subject { file('spec/models/posts_spec.rb') }
 
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe Posts/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe Posts/) }
       end
 
       describe 'the fixtures' do
         subject { file('spec/fixtures/posts.yml') }
 
-        it { should contain Regexp.new '# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html' }
+        it { should contain(Regexp.new('# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html')) }
       end
     end
 
@@ -49,4 +49,4 @@ describe Rspec::Generators::ModelGenerator do
       end
     end
   end
-end
+end

data/spec/generators/rspec/observer/observer_generator_spec.rb

@@ -15,7 +15,7 @@ describe Rspec::Generators::ObserverGenerator do
 
   describe 'the spec' do
     it { should exist }
-    it { should contain /require 'spec_helper'/ }
-    it { should contain /describe PostsObserver/ }
+    it { should contain(/require 'spec_helper'/) }
+    it { should contain(/describe PostsObserver/) }
   end
 end

data/spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -12,8 +12,8 @@ describe Rspec::Generators::ScaffoldGenerator do
 
     describe 'with no options' do
       before { run_generator %w(posts) }
-      it { should contain /require 'spec_helper'/ }
-      it { should contain /describe PostsController/ }
+      it { should contain(/require 'spec_helper'/) }
+      it { should contain(/describe PostsController/) }
     end
 
     describe 'with --no-controller_specs' do
@@ -25,7 +25,7 @@ describe Rspec::Generators::ScaffoldGenerator do
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
     before  { run_generator %w(admin/posts) }
-    it { should contain /describe Admin::PostsController/ }
+    it { should contain(/describe Admin::PostsController/)}
   end
 
   describe 'view specs' do
@@ -34,33 +34,33 @@ describe Rspec::Generators::ScaffoldGenerator do
       describe 'edit' do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/edit"/ }
-        it { should contain /it "renders the edit (.*) form"/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe "(.*)\/edit"/) }
+        it { should contain(/it "renders the edit (.*) form"/) }
       end
 
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/index"/ }
-        it { should contain /it "renders a list of (.*)"/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe "(.*)\/index"/) }
+        it { should contain(/it "renders a list of (.*)"/) }
       end
 
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/new"/ }
-        it { should contain /it "renders new (.*) form"/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe "(.*)\/new"/) }
+        it { should contain(/it "renders new (.*) form"/) }
       end
 
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
         it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe "(.*)\/show"/ }
-        it { should contain /it "renders attributes in <p>"/ }
+        it { should contain(/require 'spec_helper'/) }
+        it { should contain(/describe "(.*)\/show"/) }
+        it { should contain(/it "renders attributes in <p>"/) }
       end
     end
 
@@ -94,9 +94,9 @@ describe Rspec::Generators::ScaffoldGenerator do
 
     describe 'with default options' do
       before { run_generator %w(posts) }
-      it { should contain /require "spec_helper"/ }
-      it { should contain /describe PostsController/ }
-      it { should contain /describe "routing"/ }
+      it { should contain(/require "spec_helper"/) }
+      it { should contain(/describe PostsController/) }
+      it { should contain(/describe "routing"/) }
     end
 
     describe 'with --no-routing-specs' do

data/spec/generators/rspec/view/view_generator_spec.rb

@@ -13,8 +13,8 @@ describe Rspec::Generators::ViewGenerator do
     it 'generates a spec for the supplied action' do
       run_generator %w(posts index)
       file('spec/views/posts/index.html.erb_spec.rb').tap do |f|
-        f.should contain /require 'spec_helper'/
-        f.should contain /describe "posts\/index"/
+        f.should contain(/require 'spec_helper'/)
+        f.should contain(/describe "posts\/index"/)
       end
     end
 
@@ -22,8 +22,8 @@ describe Rspec::Generators::ViewGenerator do
       it 'generates a spec for the supplied action' do
         run_generator %w(admin/posts index)
         file('spec/views/admin/posts/index.html.erb_spec.rb').tap do |f|
-          f.should contain /require 'spec_helper'/
-          f.should contain /describe "admin\/posts\/index"/
+          f.should contain(/require 'spec_helper'/)
+          f.should contain(/describe "admin\/posts\/index"/)
         end
       end
     end
@@ -33,8 +33,8 @@ describe Rspec::Generators::ViewGenerator do
     it 'generates a spec for the supplied action' do
       run_generator %w(posts index --template_engine haml)
       file('spec/views/posts/index.html.haml_spec.rb').tap do |f|
-        f.should contain /require 'spec_helper'/
-        f.should contain /describe "posts\/index"/
+        f.should contain(/require 'spec_helper'/)
+        f.should contain(/describe "posts\/index"/)
       end
     end
   end

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

@@ -71,9 +71,11 @@ describe "be_a_new matcher" do
         it "fails" do
           expect {
             record.should be_a_new(record.class).with(:zoo => 'zoo', :car => 'car')
-          }.to raise_error(
-            %Q(attributes {"zoo"=>"zoo", "car"=>"car"} were not set on #{record.inspect})
-          )
+          }.to raise_error {|e|
+            e.message.should match(/attributes {.*} were not set on #{record.inspect}/)
+            e.message.should match(/"zoo"=>"zoo"/)
+            e.message.should match(/"car"=>"car"/)
+          }
         end
       end
 
@@ -117,10 +119,11 @@ describe "be_a_new matcher" do
         it "fails" do
           expect {
             record.should be_a_new(String).with(:zoo => 'zoo', :car => 'car')
-          }.to raise_error(
-            "expected #{record.inspect} to be a new String and " +
-            %Q(attributes {"zoo"=>"zoo", "car"=>"car"} were not set on #{record.inspect})
-          )
+          }.to raise_error {|e|
+            e.message.should match(/expected #{record.inspect} to be a new String and attributes {.*} were not set on #{record.inspect}/)
+            e.message.should match(/"zoo"=>"zoo"/)
+            e.message.should match(/"car"=>"car"/)
+          }
         end
       end
 

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

@@ -10,7 +10,7 @@ describe "ActiveSupport::Relation =~ matcher" do
   end
 
   it "fails if the scope encompasses more records than on the right hand side" do
-    another_model = MockableModel.create
+    MockableModel.create
     MockableModel.scoped.should_not =~ models.reverse
   end
 

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

@@ -4,6 +4,16 @@ describe "route_to" do
   include RSpec::Rails::Matchers::RoutingMatchers
   include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
 
+  def assert_recognizes(*)
+    # no-op
+  end
+
+  it "provides a description" do
+    matcher = route_to("these" => "options")
+    matcher.matches?(:get => "path")
+    matcher.description.should == "route {:get=>\"path\"} to {\"these\"=>\"options\"}"
+  end
+
   it "delegates to assert_recognizes" do
     self.should_receive(:assert_recognizes).with({ "these" => "options" }, { :method=> :get, :path=>"path" }, {})
     {:get => "path"}.should route_to("these" => "options")

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

@@ -80,7 +80,7 @@ describe "mock_model(RealModel)" do
   describe "with params" do
     it "does not mutate its parameters" do
       params = {:a => 'b'}
-      model = mock_model(MockableModel, params)
+      mock_model(MockableModel, params)
       params.should == {:a => 'b'}
     end
   end
@@ -234,6 +234,11 @@ describe "mock_model(RealModel)" do
         it "says it will not respond_to?(xxx_before_type_cast)" do
           @model.as_null_object.respond_to?("title_before_type_cast").should be(false)
         end
+        it "returns self for any unprepared message" do
+          @model.as_null_object.tap do |x|
+            x.non_existant_message.should be(@model)
+          end
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -17,6 +17,9 @@ class RSpec::Core::ExampleGroup
 end
 
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
   config.before(:each) do
     @real_world = RSpec.world
     RSpec.instance_variable_set(:@world, RSpec::Core::World.new)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 45
-  prerelease: 
+  hash: 2895758085
+  prerelease: 6
   segments: 
   - 2
-  - 8
-  - 1
-  version: 2.8.1
+  - 9
+  - 0
+  - rc
+  - 2
+  version: 2.9.0.rc2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -66,14 +68,16 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 2895758085
         segments: 
         - 2
-        - 8
+        - 9
         - 0
-        version: 2.8.0
+        - rc
+        - 2
+        version: 2.9.0.rc2
   prerelease: false
   requirement: *id004
   name: rspec
@@ -84,9 +88,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- License.txt
+extra_rdoc_files: []
+
 files: 
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -148,8 +151,11 @@ files:
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
-- License.txt
 - README.md
+- License.txt
+- Changelog.md
+- .yardopts
+- .document
 - features/Autotest.md
 - features/Generators.md
 - features/GettingStarted.md
@@ -245,19 +251,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.8.1
+summary: rspec-rails-2.9.0.rc2
 test_files: 
 - features/Autotest.md
 - features/Generators.md