rspec-rails 2.0.0.beta.22 → 2.0.0.rc

data/History.md

@@ -1,5 +1,14 @@
 ## rspec-rails release history (incomplete)
 
+### 2.0.0.rc / 2010-10-05
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.22...v2.0.0.rc)
+
+* Enhancements
+  * add --webrat-matchers flag to scaffold generator (for view specs)
+  * separate ActiveModel and ActiveRecord APIs in mock_model and stub_model
+  * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)
+
 ### 2.0.0.beta.22 / 2010-09-12
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.20...v2.0.0.beta.22)

data/Thorfile

@@ -0,0 +1,41 @@
+class Rails < Thor
+  VERSIONS = {
+    :rails => {
+      "3.0.0" => "v3.0.0",
+      "master" => "master",
+      "3-0-stable" => "origin/3-0-stable"
+    },
+    :arel => {
+      "3.0.0" => "v1.0.0",
+      "master" => "master",
+      "3-0-stable" => "master"
+    }
+  }
+
+  desc "checkout VERSION", "checks it out (and arel)"
+  def checkout(version)
+    unless VERSIONS[:rails].has_key?(version)
+      raise "\n#{"*"*50}\nvalid versions are: #{VERSIONS[:rails].keys.join(", ")}\n#{"*"*50}\n"
+    end
+
+    puts "***** checking out rails at #{VERSIONS[:rails][version]} ..."
+    Dir.chdir("vendor/rails") do
+      `git checkout #{VERSIONS[:rails][version]}`
+    end
+
+    puts "***** checking out arel at #{VERSIONS[:arel][version]} ..."
+    Dir.chdir("vendor/arel") do
+      `git checkout #{VERSIONS[:arel][version]}`
+    end
+  end
+
+  desc "fetch", "update vendor/rails and vendor/arel"
+  def fetch
+    Dir.chdir("vendor/rails") do
+      `git fetch`
+    end
+    Dir.chdir("vendor/arel") do
+      `git fetch`
+    end
+  end
+end

data/lib/generators/rspec/controller/controller_generator.rb

@@ -10,7 +10,7 @@ module Rspec
       class_option :view_specs,       :type => :boolean, :default => true
 
       def create_controller_files
-        return unless options[:controllers]
+        return unless options[:controller_specs]
 
         template 'controller_spec.rb',
                  File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
@@ -18,7 +18,7 @@ module Rspec
 
       def create_view_files
         return if actions.empty?
-        return unless options[:views]
+        return unless options[:view_specs]
 
         empty_directory File.join("spec", "views", file_path)
 

data/lib/generators/rspec/helper/helper_generator.rb

@@ -3,10 +3,10 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class HelperGenerator < Base
-      class_option :helpers, :type => :boolean, :default => true
+      class_option :helper_specs, :type => :boolean, :default => true
 
       def create_helper_files
-        return unless options[:helpers]
+        return unless options[:helper_specs]
 
         template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
       end

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

@@ -14,6 +14,7 @@ module Rspec
 
       class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
       class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
+      class_option :webrat_matchers,  :type => :boolean, :default => false, :desc => "Use webrat matchers in view specs"
       class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
       class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
 
@@ -49,6 +50,10 @@ module Rspec
 
       protected
 
+        def webrat?
+          options[:webrat_matchers] || @webrat_matchers_requested
+        end
+
         def copy_view(view)
           template "#{view}_spec.rb",
                    File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
@@ -126,6 +131,10 @@ module Rspec
           end
         end
 
+        def banner
+          self.class.banner
+        end
+
     end
   end
 end

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

@@ -14,10 +14,19 @@ describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   it "renders the edit <%= file_name %> form" do
     render
 
+<% if webrat? -%>
     rendered.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
       form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
+<% else -%>
+    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    assert_select "form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
   end
 end

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

@@ -19,7 +19,12 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
   it "renders a list of <%= table_name %>" do
     render
 <% 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-matchers flag if you want to use webrat matchers
+    assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
+<% end -%>
 <% end -%>
   end
 end

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

@@ -14,10 +14,19 @@ describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
   it "renders new <%= file_name %> form" do
     render
 
+<% if webrat? -%>
     rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
       form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
+<% else -%>
+    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    assert_select "form", :action => <%= table_name %>_path, :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
   end
 end

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

@@ -15,7 +15,12 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
+<% if webrat? -%>
     rendered.should contain(<%= value_for(attribute) %>.to_s)
+<% else -%>
+    # Run the generator again with the --webrat-matchers flag if you want to use webrat matchers
+    rendered.should match(/<%= eval(value_for(attribute)) %>/)
+<% end -%>
 <% end -%>
   end
 end

data/lib/rspec-rails.rb

@@ -1,8 +1,10 @@
 module RSpec
   module Rails
     class Railtie < ::Rails::Railtie
-      config.generators.integration_tool :rspec
-      config.generators.test_framework   :rspec
+      # Rails-3.0.1 requires config.app_generators instead of 3.0.0's config.generators
+      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      generators.integration_tool :rspec
+      generators.test_framework   :rspec
 
       rake_tasks do
         load "rspec/rails/tasks/rspec.rake"

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

@@ -169,6 +169,7 @@ module RSpec::Rails
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false
       end
+      subject { controller }
     end
 
     RSpec.configure &include_self_when_dir_matches('spec','controllers')

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

@@ -49,7 +49,7 @@ module RSpec::Rails
       # Returns an instance of ActionView::Base with the helper being specified
       # mixed in, along with any of the built-in rails helpers.
       def helper
-        _view.tap {|v| v.assign(_assigns)}
+        _view.tap {|v| v.assign(view_assigns)}
       end
 
     private

data/lib/rspec/rails/matchers.rb

@@ -21,5 +21,6 @@ end
 require 'rspec/rails/matchers/render_template'
 require 'rspec/rails/matchers/redirect_to'
 require 'rspec/rails/matchers/routing_matchers'
+require 'rspec/rails/matchers/be_new_record'
 require 'rspec/rails/matchers/be_a_new'
 require 'rspec/rails/matchers/have_extension'

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

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :be_new_record do
+  match do |actual|
+    !actual.persisted?
+  end
+end

data/lib/rspec/rails/mocks.rb

@@ -5,27 +5,27 @@ module RSpec
 
     module Mocks
 
-      module InstanceMethods
-        def valid?
-          true
-        end
-
+      module ActiveModelInstanceMethods
         def as_new_record
+          self.stub(:persisted?) { false }
           self.stub(:id) { nil }
           self
         end
 
-        def new_record?
-          !persisted?
-        end
-
         def persisted?
-          !!id
+          true
         end
+      end
 
+      module ActiveRecordInstanceMethods
         def destroy
+          self.stub(:persisted?) { false }
           self.stub(:id) { nil }
         end
+
+        def new_record?
+          !persisted?
+        end
       end
 
       # Creates a mock object instance for a +string_or_model_class+ with
@@ -37,7 +37,7 @@ module RSpec
       #   * A String representing a Class that does not exist
       #   * A String representing a Class that extends ActiveModel::Naming
       #   * A Class that extends ActiveModel::Naming
-      def mock_model(string_or_model_class, options_and_stubs = {})
+      def mock_model(string_or_model_class, stubs = {})
         if String === string_or_model_class
           if Object.const_defined?(string_or_model_class)
             model_class = Object.const_get(string_or_model_class)
@@ -61,57 +61,71 @@ It received #{model_class.inspect}
 EOM
         end
 
-        id = options_and_stubs.has_key?(:id) ? options_and_stubs[:id] : next_id
-        options_and_stubs = options_and_stubs.reverse_merge({
-          :id => id,
-          :destroyed? => false,
-          :marked_for_destruction? => false
-        })
-        derived_name = "#{model_class.name}_#{id}"
-        m = mock(derived_name, options_and_stubs)
-        m.extend InstanceMethods
-        m.extend ActiveModel::Conversion
-        errors = ActiveModel::Errors.new(m)
-        [:save, :update_attributes].each do |key|
-          if options_and_stubs[key] == false
-            errors.stub(:empty?) { false }
+        stubs = stubs.reverse_merge(:id => next_id)
+        stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
+        stubs = stubs.reverse_merge(:destroyed? => false)
+        stubs = stubs.reverse_merge(:marked_for_destruction? => false)
+
+        mock("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
+          m.extend ActiveModelInstanceMethods
+          m.singleton_class.__send__ :include, ActiveModel::Conversion
+          m.singleton_class.__send__ :include, ActiveModel::Validations
+          if RSpec::Rails::using_active_record?
+            m.extend ActiveRecordInstanceMethods
+            [:save, :update_attributes].each do |key|
+              if stubs[key] == false
+                m.errors.stub(:empty?) { false }
+              end
+            end
           end
+          m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
+            def @object.is_a?(other)
+              #{model_class}.ancestors.include?(other)
+            end
+            def @object.kind_of?(other)
+              #{model_class}.ancestors.include?(other)
+            end
+            def @object.instance_of?(other)
+              other == #{model_class}
+            end
+            def @object.respond_to?(method_name)
+              #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s) || super
+            end
+            def @object.class
+              #{model_class}
+            end
+            def @object.to_s
+              "#{model_class.name}_#{to_param}"
+            end
+          CODE
+          yield m if block_given?
         end
-        m.stub(:errors) { errors }
-        m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
-          def @object.is_a?(other)
-            #{model_class}.ancestors.include?(other)
-          end
-          def @object.kind_of?(other)
-            #{model_class}.ancestors.include?(other)
-          end
-          def @object.instance_of?(other)
-            other == #{model_class}
-          end
-          def @object.respond_to?(method_name)
-            #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s) || super
-          end
-          def @object.class
-            #{model_class}
-          end
-          def @object.to_s
-            "#{model_class.name}_#{id}"
-          end
-        CODE
-        yield m if block_given?
-        m
       end
 
-      module ModelStubber
-        def connection
-          raise RSpec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
+      module ActiveModelStubExtensions
+        def as_new_record
+          self.stub(:persisted?)  { false }
+          self.stub(:id)          { nil }
+          self
         end
-        def new_record?
-          __send__(self.class.primary_key).nil?
+
+        def persisted?
+          true
         end
+      end
+
+      module ActiveRecordStubExtensions
         def as_new_record
           self.__send__("#{self.class.primary_key}=", nil)
-          self
+          super
+        end
+
+        def new_record?
+          !persisted?
+        end
+
+        def connection
+          raise RSpec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
         end
       end
 
@@ -121,12 +135,15 @@ EOM
       #   stub_model(Model, hash_of_stubs)
       #   stub_model(Model, instance_variable_name, hash_of_stubs)
       #
-      # Creates an instance of +Model+ that is prohibited from accessing the
-      # database*. For each key in +hash_of_stubs+, if the model has a
-      # matching attribute (determined by asking it) are simply assigned the
-      # submitted values. If the model does not have a matching attribute, the
-      # key/value pair is assigned as a stub return value using RSpec's
-      # mocking/stubbing framework.
+      # Creates an instance of +Model+ with +to_param+ stubbed using a
+      # generated value that is unique to each object.. If +Model+ is an
+      # +ActiveRecord+ model, it is prohibited from accessing the database*.
+      #
+      # For each key in +hash_of_stubs+, if the model has a matching attribute
+      # (determined by asking it) are simply assigned the submitted values. If
+      # the model does not have a matching attribute, the key/value pair is
+      # assigned as a stub return value using RSpec's mocking/stubbing
+      # framework.
       #
       # <tt>new_record?</tt> is overridden to return the result of id.nil?
       # This means that by default new_record? will return false. If  you want
@@ -151,16 +168,25 @@ EOM
       #
       #   stub_model(Person)
       #   stub_model(Person).as_new_record
-      #   stub_model(Person, :id => 37)
+      #   stub_model(Person, :to_param => 37)
       #   stub_model(Person) do |person|
       #     person.first_name = "David"
       #   end
       def stub_model(model_class, stubs={})
-        primary_key = model_class.primary_key.to_sym
-        stubs = {primary_key => next_id}.merge(stubs)
         model_class.new.tap do |m|
-          m.__send__("#{primary_key}=", stubs.delete(primary_key))
-          m.extend ModelStubber
+          m.extend ActiveModelStubExtensions
+          if RSpec::Rails::using_active_record? && model_class < ActiveRecord::Base
+            m.extend ActiveRecordStubExtensions
+            primary_key = model_class.primary_key.to_sym
+            stubs = stubs.reverse_merge(primary_key => next_id)
+            stubs = stubs.reverse_merge(:persisted? => !!stubs[primary_key])
+          else
+            stubs = stubs.reverse_merge(:id => next_id)
+            stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
+          end
+          stubs.each do |k,v|
+            m.__send__("#{k}=", stubs.delete(k)) if m.respond_to?("#{k}=")
+          end
           m.stub(stubs)
           yield m if block_given?
         end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.beta.22'
+      STRING = '2.0.0.rc'
     end
   end
 end

data/lib/rspec/rails/view_assigns.rb

@@ -13,15 +13,24 @@ module RSpec
           _encapsulated_assigns[key] = value
         end
 
+        if ::Rails::VERSION::STRING == "3.0.0"
+          def _assigns
+            super.merge(_encapsulated_assigns)
+          end
+          def view_assigns
+            _assigns
+          end
+        else # >= 3.0.1
+          def view_assigns
+            super.merge(_encapsulated_assigns)
+          end
+        end
+
       private
 
         def _encapsulated_assigns
           @_encapsulated_assigns ||= {}
         end
-
-        def _assigns
-          super.merge(_encapsulated_assigns)
-        end
       end
     end
   end

data/rspec-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   Thank you for installing #{s.summary}!
 
-  This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
+  This version of rspec-rails only works with versions of rails >= 3.0.0
 
   To configure your app to use rspec-rails, add a declaration to your Gemfile.
   If you are using Bundler's grouping feature in your Gemfile, be sure to include

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

@@ -5,18 +5,35 @@ module RSpec::Rails
     it { should be_included_in_files_in('./spec/controllers/') }
     it { should be_included_in_files_in('.\\spec\\controllers\\') }
 
-    it "includes routing matchers" do
-      group = RSpec::Core::ExampleGroup.describe do
+    let(:group) do
+      RSpec::Core::ExampleGroup.describe do
         include ControllerExampleGroup
       end
+    end
+
+    it "includes routing matchers" do
       group.included_modules.should include(RSpec::Rails::Matchers::RoutingMatchers)
     end
 
     it "adds :type => :controller to the metadata" do
-      group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
-      end
       group.metadata[:type].should eq(:controller)
     end
+
+    context "with implicit subject" do
+      it "uses the controller as the subject" do
+        controller = double('controller')
+        example = group.new
+        example.stub(:controller => controller)
+        example.subject.should == controller
+      end
+    end
+
+    describe "with explicit subject" do
+      it "should use the specified subject instead of the controller" do
+        group.subject { 'explicit' }
+        example = group.new
+        example.subject.should == 'explicit'
+      end
+    end
   end
 end

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

@@ -24,7 +24,7 @@ module RSpec::Rails
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
         helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
-        helper_spec.should_receive(:_assigns)
+        helper_spec.should_receive(:view_assigns)
         av_tc_b_view = double('_view')
         av_tc_b_view.should_receive(:assign)
         helper_spec.stub(:_view) { av_tc_b_view }

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

@@ -15,7 +15,7 @@ module RSpec::Rails
     describe 'automatic inclusion of helpers' do
       module ::ThingsHelper; end
 
-      it 'includes the helper with the same name' do
+      pending 'includes the helper with the same name' do
         group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
         group.should_receive(:helper).with(ThingsHelper)
         group.class_eval do

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

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "be_new_record" do
+  context "un-persisted record" do
+    it "passes" do
+      record = double('record', :persisted? => false)
+      record.should be_new_record
+    end
+  end
+
+  context "persisted record" do
+    it "fails" do
+      record = double('record', :persisted? => true)
+      record.should_not be_new_record
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ end
 
 class NonActiveRecordModel
   extend ActiveModel::Naming
+  include ActiveModel::Conversion
 end
 
 class MockableModel < ActiveRecord::Base

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

@@ -41,19 +41,17 @@ describe "mock_model(RealModel)" do
     before(:each) do
       @model = mock_model(MockableModel, :id => 1)
     end
+
     it "is named using the stubbed id value" do
       @model.instance_variable_get(:@name).should == "MockableModel_1"
     end
-    it "returns string of id value for to_param" do
-      @model.to_param.should == "1"
-    end
   end
 
   describe "destroy" do
-    it "sets id to nil" do
+    it "sets persisted to false" do
       model = mock_model(MockableModel)
       model.destroy
-      model.id.should be_nil
+      model.should_not be_persisted
     end
   end
 
@@ -181,26 +179,25 @@ describe "mock_model(RealModel)" do
   end
 
   describe "#persisted?" do
-    context "with default id" do
+    context "with default identifier" do
       it "returns true" do
         mock_model(MockableModel).should be_persisted
       end
     end
 
-    context "with explicit id" do
+    context "with explicit identifier via :id" do
       it "returns true" do
         mock_model(MockableModel, :id => 37).should be_persisted
       end
     end
 
-    context "with id nil" do
+    context "with id => nil" do
       it "returns false" do
         mock_model(MockableModel, :id => nil).should_not be_persisted
       end
     end
   end
 
-
   describe "#valid?" do
     context "default" do
       it "returns true" do
@@ -220,6 +217,11 @@ describe "mock_model(RealModel)" do
       m.as_new_record.should be_new_record
     end
 
+    it "says it is not persisted" do
+      m = mock_model(MockableModel)
+      m.as_new_record.should_not be_persisted
+    end
+
     it "has a nil id" do
       mock_model(MockableModel).as_new_record.id.should be(nil)
     end

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

@@ -2,100 +2,149 @@ require 'spec_helper'
 require File.dirname(__FILE__) + '/ar_classes'
 
 describe "stub_model" do
-  describe "defaults" do
-    it "has an id" do
-      stub_model(MockableModel).id.should be > 0
+
+  shared_examples_for "stub model" do
+    describe "with a block" do
+      it "yields the model" do
+        model = stub_model(model_class) do |block_arg|
+          @block_arg = block_arg
+        end
+        model.should be(@block_arg)
+      end
     end
 
-    it "says it is not a new record" do
-      stub_model(MockableModel).should_not be_new_record
+    describe "#persisted?" do
+      context "default" do
+        it "returns true" do
+          model = stub_model(model_class)
+          model.should be_persisted
+        end
+      end
+
+      context "with as_new_record" do
+        it "returns false" do
+          model = stub_model(model_class).as_new_record
+          model.should_not be_persisted
+        end
+      end
     end
-  end
 
-  it "accepts a stub id" do
-    stub_model(MockableModel, :id => 37).id.should == 37
-  end
+    it "increments the value returned by to_param" do
+      first = stub_model(model_class)
+      second = stub_model(model_class)
+      second.to_param.to_i.should == (first.to_param.to_i + 1)
+    end
 
-  it "says it is a new record when id is set to nil" do
-    stub_model(MockableModel, :id => nil).should be_new_record
   end
 
-  it "accepts any arbitrary stub" do
-    stub_model(MockableModel, :foo => "bar").foo.should == "bar"
+  context "with ActiveModel (not ActiveRecord)" do
+    it_behaves_like "stub model" do
+      def model_class
+        NonActiveRecordModel
+      end
+    end
   end
 
-  it "accepts a stub for save" do
-    stub_model(MockableModel, :save => false).save.should be(false)
-  end
-  
-  describe "alternate primary key" do
-    it "has the correct primary_key name" do
-      stub_model(AlternatePrimaryKeyModel).class.primary_key.should eql('my_id')
+  context "with an ActiveRecord model" do
+    let(:model_class) { MockableModel }
+
+    it_behaves_like "stub model"
+
+    describe "#new_record?" do
+      context "default" do
+        it "returns false" do
+          model = stub_model(model_class)
+          model.new_record?.should be_false
+        end
+      end
+
+      context "with as_new_record" do
+        it "returns true" do
+          model = stub_model(model_class).as_new_record
+          model.new_record?.should be_true
+        end
+      end
     end
-    
-    it "has a primary_key" do
-      stub_model(AlternatePrimaryKeyModel).my_id.should be > 0
+
+    describe "defaults" do
+      it "has an id" do
+        stub_model(MockableModel).id.should be > 0
+      end
+
+      it "says it is not a new record" do
+        stub_model(MockableModel).should_not be_new_record
+      end
     end
-    
-    it "does not say it is a new record" do
-      stub_model(AlternatePrimaryKeyModel).should_not be_new_record
+
+    describe "#as_new_record" do
+      it "has a nil id" do
+        stub_model(MockableModel).as_new_record.id.should be(nil)
+      end
     end
-    
-    it "says it is a new record if primary_key is nil" do
-      stub_model(AlternatePrimaryKeyModel, :my_id => nil).should be_new_record
+
+    it "raises when hitting the db" do
+      lambda do
+        stub_model(ConnectableModel).connection
+      end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
     end
-    
-    it "accepts a stub for the primary_key" do
-      stub_model(AlternatePrimaryKeyModel, :my_id => 5).my_id.should == 5
+
+    it "increments the id" do
+      first = stub_model(model_class)
+      second = stub_model(model_class)
+      second.id.should == (first.id + 1)
     end
-  end
 
-  describe "#as_new_record" do
-    it "says it is a new record" do
-      stub_model(MockableModel).as_new_record.should be_new_record
+    it "accepts a stub id" do
+      stub_model(MockableModel, :id => 37).id.should == 37
     end
 
-    it "has a nil id" do
-      stub_model(MockableModel).as_new_record.id.should be(nil)
+    it "says it is a new record when id is set to nil" do
+      stub_model(MockableModel, :id => nil).should be_new_record
     end
-  end
 
-  it "raises when hitting the db" do
-    lambda do
-      stub_model(ConnectableModel).connection
-    end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
-  end
+    it "accepts a stub for save" do
+      stub_model(MockableModel, :save => false).save.should be(false)
+    end
 
-  it "increments the id" do
-    first = stub_model(MockableModel)
-    second = stub_model(MockableModel)
-    second.id.should == (first.id + 1)
-  end
+    describe "alternate primary key" do
+      it "has the correct primary_key name" do
+        stub_model(AlternatePrimaryKeyModel).class.primary_key.should eql('my_id')
+      end
 
-  describe "as association" do
-    before(:each) do
-      @real = AssociatedModel.create!
-      @stub_model = stub_model(MockableModel)
-      @real.mockable_model = @stub_model
-    end
+      it "has a primary_key" do
+        stub_model(AlternatePrimaryKeyModel).my_id.should be > 0
+      end
 
-    it "passes associated_model == mock" do
-        @stub_model.should == @real.mockable_model
-    end
+      it "says it is not a new record" do
+        stub_model(AlternatePrimaryKeyModel) do |m|
+          m.should_not be_new_record
+        end
+      end
 
-    it "passes mock == associated_model" do
-        @real.mockable_model.should == @stub_model
+      it "says it is a new record if primary_key is nil" do
+        stub_model(AlternatePrimaryKeyModel, :my_id => nil).should be_new_record
+      end
+
+      it "accepts a stub for the primary_key" do
+        stub_model(AlternatePrimaryKeyModel, :my_id => 5).my_id.should == 5
+      end
     end
-  end
 
-  describe "with a block" do
-    it "yields the model" do
-      model = stub_model(MockableModel) do |block_arg|
-        @block_arg = block_arg
+    describe "as association" do
+      before(:each) do
+        @real = AssociatedModel.create!
+        @stub_model = stub_model(MockableModel)
+        @real.mockable_model = @stub_model
+      end
+
+      it "passes associated_model == mock" do
+          @stub_model.should == @real.mockable_model
+      end
+
+      it "passes mock == associated_model" do
+          @real.mockable_model.should == @stub_model
       end
-      model.should be(@block_arg)
     end
+
   end
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
+  hash: 7712058
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta
-  - 22
-  version: 2.0.0.beta.22
+  - rc
+  version: 2.0.0.rc
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,26 +17,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -05:00
+date: 2010-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - rc
+        version: 2.0.0.rc
+  requirement: *id001
   type: :runtime
+  name: rspec
   prerelease: false
-  version_requirements: *id001
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -53,6 +53,7 @@ files:
 - History.md
 - README.markdown
 - Rakefile
+- Thorfile
 - Upgrade.markdown
 - autotest/discover.rb
 - cucumber.yml
@@ -124,6 +125,7 @@ files:
 - lib/rspec/rails/fixture_support.rb
 - 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/have_extension.rb
 - lib/rspec/rails/matchers/redirect_to.rb
 - lib/rspec/rails/matchers/render_template.rb
@@ -147,6 +149,7 @@ files:
 - spec/rspec/rails/example/view_rendering_spec.rb
 - spec/rspec/rails/fixture_support_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
+- spec/rspec/rails/matchers/be_new_record_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb
@@ -167,9 +170,9 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.22!
+    Thank you for installing rspec-rails-2.0.0.rc!
   
-    This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
+    This version of rspec-rails only works with versions of rails >= 3.0.0
   
     To configure your app to use rspec-rails, add a declaration to your Gemfile.
     If you are using Bundler's grouping feature in your Gemfile, be sure to include
@@ -177,7 +180,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.beta.22"
+        gem "rspec-rails", ">= 2.0.0.rc"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -208,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4218695540923363031
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -217,6 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -228,7 +232,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.22
+summary: rspec-rails-2.0.0.rc
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature
@@ -262,6 +266,7 @@ test_files:
 - spec/rspec/rails/example/view_rendering_spec.rb
 - spec/rspec/rails/fixture_support_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
+- spec/rspec/rails/matchers/be_new_record_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb