rspec-rails 2.6.1 → 2.7.0.rc1

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

@@ -1,8 +1,7 @@
 require 'spec_helper'
-require File.dirname(__FILE__) + '/ar_classes'
 
 describe "mock_model(RealModel)" do
-
+  
   context "given a String" do
     context "that does not represent an existing constant" do
       it "class says it's name" do
@@ -102,40 +101,74 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "as association that doesn't exist yet" do
+    before(:each) do
+      @real = AssociatedModel.create!
+      @mock_model = mock_model("Other")
+      @real.nonexistent_model = @mock_model
+    end
+
+    it "passes: associated_model == mock" do
+      @mock_model.should == @real.nonexistent_model
+    end
+
+    it "passes: mock == associated_model" do
+      @real.nonexistent_model.should == @mock_model
+    end
+  end
+
   describe "#is_a?" do
     before(:each) do
       @model = mock_model(SubMockableModel)
     end
+    
     it "says it is_a?(RealModel)" do
       @model.is_a?(SubMockableModel).should be(true)
     end
+    
     it "says it is_a?(OtherModel) if RealModel is an ancestors" do
       @model.is_a?(MockableModel).should be(true)
     end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :is_a? => true).is_a?(:Foo).should be_true
+    end
   end
 
   describe "#kind_of?" do
     before(:each) do
       @model = mock_model(SubMockableModel)
     end
+    
     it "says it is kind_of? if RealModel is" do
       @model.kind_of?(SubMockableModel).should be(true)
     end
+    
     it "says it is kind_of? if RealModel's ancestor is" do
       @model.kind_of?(MockableModel).should be(true)
     end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :kind_of? => true).kind_of?(:Foo).should be_true
+    end
   end
 
   describe "#instance_of?" do
     before(:each) do
       @model = mock_model(SubMockableModel)
     end
+    
     it "says it is instance_of? if RealModel is" do
       @model.instance_of?(SubMockableModel).should be(true)
     end
+    
     it "does not say it instance_of? if RealModel isn't, even if it's ancestor is" do
       @model.instance_of?(MockableModel).should be(false)
     end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :instance_of? => true).instance_of?(:Foo).should be_true
+    end
   end
 
   describe "#respond_to?" do
@@ -162,6 +195,7 @@ describe "mock_model(RealModel)" do
           @model.respond_to?("title_before_type_cast").should be(false)
         end
       end
+      
       context "with as_null_object" do
         it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
           @model.as_null_object.respond_to?("column_a").should be(true)
@@ -180,6 +214,7 @@ describe "mock_model(RealModel)" do
         model = NonActiveRecordModel.new
         model.should respond_to(:to_param)
       end
+      
       context "with as_null_object" do
         it "says it will not respond_to?(xxx_before_type_cast)" do
           model = NonActiveRecordModel.new.as_null_object
@@ -187,6 +222,30 @@ describe "mock_model(RealModel)" do
         end
       end
     end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :respond_to? => true).respond_to?(:foo).should be_true
+    end
+  end
+  
+  describe "#class" do
+    it "returns the mocked model" do
+      mock_model(MockableModel).class.should eq(MockableModel)
+    end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :class => String).class.should be(String)
+    end
+  end
+
+  describe "#to_s" do
+    it "returns (model.name)_(model#to_param)" do
+      mock_model(MockableModel).to_s.should == "MockableModel_#{to_param}"
+    end
+    
+    it "can be stubbed" do
+      mock_model(MockableModel, :to_s => "this string").to_s.should == "this string"
+    end
   end
 
   describe "#destroyed?" do
@@ -233,6 +292,7 @@ describe "mock_model(RealModel)" do
         mock_model(MockableModel).should be_valid
       end
     end
+    
     context "stubbed with false" do
       it "returns false" do
         mock_model(MockableModel, :valid? => false).should_not be_valid

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require File.dirname(__FILE__) + '/ar_classes'
 
 describe "stub_model" do
 

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ module RSpecRails
 end
 
 require 'rspec/rails'
+require 'ammeter/init'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
@@ -23,4 +24,4 @@ RSpec.configure do |c|
   c.after(:each) do
     RSpec.instance_variable_set(:@world, @real_world)
   end
-end
+end

data/spec/{rspec/rails/mocks → support}/ar_classes.rb

@@ -5,10 +5,12 @@ ActiveRecord::Base.establish_connection(
 
 module Connections
   def self.extended(host)
-
     host.connection.execute <<-eosql
       CREATE TABLE #{host.table_name} (
-        #{host.primary_key} integer PRIMARY KEY AUTOINCREMENT
+        #{host.primary_key} integer PRIMARY KEY AUTOINCREMENT,
+        associated_model_id integer,
+        mockable_model_id integer,
+        nonexistent_model_id integer
       )
     eosql
   end
@@ -30,6 +32,7 @@ end
 class AssociatedModel < ActiveRecord::Base
   extend Connections
   belongs_to :mockable_model
+  belongs_to :nonexistent_model, :class_name => "Other"
 end
 
 class AlternatePrimaryKeyModel < ActiveRecord::Base

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  hash: 15424039
+  prerelease: 6
   segments: 
   - 2
-  - 6
+  - 7
+  - 0
+  - rc
   - 1
-  version: 2.6.1
+  version: 2.7.0.rc1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -05:00
-default_executable: 
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: activesupport
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +33,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id001
-  name: activesupport
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: actionpack
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +48,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id002
-  name: actionpack
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: railties
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,25 +63,25 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id003
-  name: railties
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15424039
         segments: 
         - 2
-        - 6
+        - 7
         - 0
-        version: 2.6.0
-  version_requirements: *id004
-  name: rspec
-  prerelease: false
+        - rc
+        - 1
+        version: 2.7.0.rc1
+  requirement: *id004
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com
 executables: []
@@ -88,66 +91,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
-- History.md
-- License.txt
-- README.md
-- README_DEV.md
-- Rakefile
-- Thorfile
-- Upgrade.md
-- cucumber.yml
-- features/.nav
-- features/Autotest.md
-- features/Changelog.md
-- features/Generators.md
-- features/GettingStarted.md
-- features/README.md
-- features/RailsVersions.md
-- features/Upgrade.md
-- features/controller_specs/README.md
-- features/controller_specs/anonymous_controller.feature
-- features/controller_specs/controller_spec.feature
-- features/controller_specs/isolation_from_views.feature
-- features/controller_specs/render_views.feature
-- features/helper_specs/helper_spec.feature
-- features/mailer_specs/url_helpers.feature
-- features/matchers/README.md
-- features/matchers/new_record_matcher.feature
-- features/matchers/redirect_to_matcher.feature
-- features/matchers/render_template_matcher.feature
-- features/mocks/mock_model.feature
-- features/mocks/stub_model.feature
-- features/model_specs/README.md
-- features/model_specs/errors_on.feature
-- features/model_specs/transactional_examples.feature
-- features/request_specs/request_spec.feature
-- features/routing_specs/README.md
-- features/routing_specs/be_routable_matcher.feature
-- features/routing_specs/named_routes.feature
-- features/routing_specs/route_to_matcher.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/step_definitions/model_steps.rb
-- features/support/env.rb
-- features/view_specs/inferred_controller_path.feature
-- features/view_specs/stub_template.feature
-- features/view_specs/view_spec.feature
-- gemfiles/.bundle/config
-- gemfiles/base.rb
-- gemfiles/rails-3-0-stable
-- gemfiles/rails-3.0.0
-- gemfiles/rails-3.0.1
-- gemfiles/rails-3.0.2
-- gemfiles/rails-3.0.3
-- gemfiles/rails-3.0.4
-- gemfiles/rails-3.0.5
-- gemfiles/rails-3.0.6
-- gemfiles/rails-3.0.7
-- gemfiles/rails-3.1.0.rc1
-- gemfiles/rails-master
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
@@ -197,6 +140,7 @@ files:
 - 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/relation_match_array.rb
 - lib/rspec/rails/matchers/render_template.rb
 - lib/rspec/rails/matchers/routing_matchers.rb
 - lib/rspec/rails/mocks.rb
@@ -207,8 +151,54 @@ files:
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
-- rspec-rails.gemspec
+- README.md
+- features/Autotest.md
+- features/Generators.md
+- features/GettingStarted.md
+- features/README.md
+- features/RailsVersions.md
+- features/Transactions.md
+- features/Upgrade.md
+- features/controller_specs/Cookies.md
+- features/controller_specs/README.md
+- features/controller_specs/anonymous_controller.feature
+- features/controller_specs/bypass_rescue.feature
+- features/controller_specs/controller_spec.feature
+- features/controller_specs/isolation_from_views.feature
+- features/controller_specs/render_views.feature
+- features/helper_specs/helper_spec.feature
+- features/mailer_specs/url_helpers.feature
+- features/matchers/README.md
+- features/matchers/new_record_matcher.feature
+- features/matchers/redirect_to_matcher.feature
+- features/matchers/relation_match_array.feature
+- features/matchers/render_template_matcher.feature
+- features/mocks/mock_model.feature
+- features/mocks/stub_model.feature
+- features/model_specs/README.md
+- features/model_specs/errors_on.feature
+- features/model_specs/transactional_examples.feature
+- features/request_specs/request_spec.feature
+- features/routing_specs/README.md
+- features/routing_specs/be_routable_matcher.feature
+- features/routing_specs/named_routes.feature
+- features/routing_specs/route_to_matcher.feature
+- features/step_definitions/additional_cli_steps.rb
+- features/step_definitions/model_steps.rb
+- features/support/env.rb
+- features/view_specs/inferred_controller_path.feature
+- features/view_specs/stub_template.feature
+- features/view_specs/view_spec.feature
 - spec/autotest/rails_rspec2_spec.rb
+- spec/generators/rspec/controller/controller_generator_spec.rb
+- spec/generators/rspec/helper/helper_generator_spec.rb
+- spec/generators/rspec/install/install_generator_spec.rb
+- spec/generators/rspec/integration/integration_generator_spec.rb
+- spec/generators/rspec/mailer/mailer_generator_spec.rb
+- spec/generators/rspec/model/model_generator_spec.rb
+- spec/generators/rspec/observer/observer_generator_spec.rb
+- spec/generators/rspec/scaffold/scaffold_generator_spec.rb
+- spec/generators/rspec/view/view_generator_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/configuration_spec.rb
 - spec/rspec/rails/deprecations_spec.rb
@@ -227,18 +217,16 @@ files:
 - spec/rspec/rails/matchers/be_routable_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
+- spec/rspec/rails/matchers/relation_match_array_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb
 - spec/rspec/rails/matchers/route_to_spec.rb
-- spec/rspec/rails/mocks/ar_classes.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
+- spec/support/ar_classes.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
-- templates/generate_stuff.rb
-- templates/run_specs.rb
-has_rdoc: true
 homepage: http://github.com/rspec/rspec-rails
 licenses: []
 
@@ -259,29 +247,33 @@ 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.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.6.1
+summary: rspec-rails-2.7.0.rc1
 test_files: 
 - features/Autotest.md
-- features/Changelog.md
 - features/Generators.md
 - features/GettingStarted.md
 - features/README.md
 - features/RailsVersions.md
+- features/Transactions.md
 - features/Upgrade.md
+- features/controller_specs/Cookies.md
 - features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
+- features/controller_specs/bypass_rescue.feature
 - features/controller_specs/controller_spec.feature
 - features/controller_specs/isolation_from_views.feature
 - features/controller_specs/render_views.feature
@@ -290,6 +282,7 @@ test_files:
 - features/matchers/README.md
 - features/matchers/new_record_matcher.feature
 - features/matchers/redirect_to_matcher.feature
+- features/matchers/relation_match_array.feature
 - features/matchers/render_template_matcher.feature
 - features/mocks/mock_model.feature
 - features/mocks/stub_model.feature
@@ -308,6 +301,15 @@ test_files:
 - features/view_specs/stub_template.feature
 - features/view_specs/view_spec.feature
 - spec/autotest/rails_rspec2_spec.rb
+- spec/generators/rspec/controller/controller_generator_spec.rb
+- spec/generators/rspec/helper/helper_generator_spec.rb
+- spec/generators/rspec/install/install_generator_spec.rb
+- spec/generators/rspec/integration/integration_generator_spec.rb
+- spec/generators/rspec/mailer/mailer_generator_spec.rb
+- spec/generators/rspec/model/model_generator_spec.rb
+- spec/generators/rspec/observer/observer_generator_spec.rb
+- spec/generators/rspec/scaffold/scaffold_generator_spec.rb
+- spec/generators/rspec/view/view_generator_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/configuration_spec.rb
 - spec/rspec/rails/deprecations_spec.rb
@@ -326,12 +328,13 @@ test_files:
 - spec/rspec/rails/matchers/be_routable_spec.rb
 - spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
+- spec/rspec/rails/matchers/relation_match_array_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb
 - spec/rspec/rails/matchers/route_to_spec.rb
-- spec/rspec/rails/mocks/ar_classes.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
 - spec/rspec/rails/view_rendering_spec.rb
 - spec/spec_helper.rb
+- spec/support/ar_classes.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb