rspec-rails 2.0.0.beta.5 → 2.0.0.beta.6

data/Rakefile

@@ -63,6 +63,14 @@ namespace :rails do
       end
     end
   end
+
+  desc "update the rails repo"
+  task :update => :clone do
+    Dir.chdir('tmp/rails') do
+      sh "git checkout master"
+      sh "git pull"
+    end
+  end
 end
 
 namespace :generate do
@@ -97,8 +105,6 @@ namespace :db do
   end
 end
 
-
-
 desc "run a variety of specs against the generated app"
 task :smoke do
   Dir.chdir("./tmp/example_app/") do
@@ -111,9 +117,12 @@ task :clobber do
   rm_rf "pkg"
 end
 
-task :clobber_app do
-  rm_rf "tmp/example_app"
+namespace :clobber do
+  desc "clobber the generated app"
+  task :app do
+    rm_rf "tmp/example_app"
+  end
 end
 
-task :default => [:clobber_app, "generate:app", "generate:stuff", :spec, :cucumber, :smoke]
+task :default => ["clobber:app", "generate:app", "generate:stuff", :spec, :cucumber, :smoke]
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.5
+2.0.0.beta.6

data/lib/autotest/rails_rspec2.rb

@@ -0,0 +1,76 @@
+# (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+$:.push(*Dir["vendor/rails/*/lib"])
+
+require 'active_support'
+require 'autotest/rspec2'
+
+Autotest.add_hook :initialize do |at|
+  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins previous_failures.txt}.each do |exception|
+    at.add_exception(exception)
+  end
+  
+  at.clear_mappings
+  
+  at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
+    ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
+  }
+  at.add_mapping(%r%^spec/(models|controllers|routing|views|helpers|lib)/.*rb$%) { |filename, _|
+    filename
+  }
+  at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
+    ["spec/models/#{m[1]}_spec.rb"]
+  }
+  at.add_mapping(%r%^app/views/(.*)$%) { |_, m|
+    at.files_matching %r%^spec/views/#{m[1]}_spec.rb$%
+  }
+  at.add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
+    if m[1] == "application"
+      at.files_matching %r%^spec/controllers/.*_spec\.rb$%
+    else
+      ["spec/controllers/#{m[1]}_spec.rb"]
+    end
+  }
+  at.add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
+    if m[1] == "application" then
+      at.files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
+    else
+      ["spec/helpers/#{m[1]}_helper_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+    end
+  }
+  at.add_mapping(%r%^config/routes\.rb$%) {
+    at.files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^config/database\.yml$%) { |_, m|
+    at.files_matching %r%^spec/models/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
+    at.files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
+    ["spec/lib/#{m[1]}_spec.rb"]
+  }
+end
+
+class Autotest::RailsRspec2 < Autotest::Rspec2
+end

data/lib/generators/rspec/install/install_generator.rb

@@ -25,6 +25,10 @@ DESC
         directory 'spec'
       end
 
+      def copy_autotest_discover_file
+        directory 'autotest'
+      end
+
       def app_name
         Rails.application.class.name
       end

data/lib/generators/rspec/install/templates/autotest/discover.rb

@@ -0,0 +1,2 @@
+Autotest.add_discovery { "rails" }
+Autotest.add_discovery { "rspec2" }

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe <%= class_name.pluralize %> do
+describe "<%= class_name.pluralize %>" do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= table_name %>_path

data/lib/rspec/rails/mocks.rb

@@ -15,11 +15,12 @@ module Rspec
           :to_param => id.to_s,
           :new_record? => false,
           :destroyed? => false,
+          :marked_for_destruction? => false,
           :errors => stub("errors", :count => 0)
         })
         derived_name = "#{model_class.name}_#{id}"
         m = mock(derived_name, options_and_stubs)
-        m.__send__(:__mock_proxy).instance_eval <<-CODE
+        m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
           def @object.as_new_record
             self.stub(:id) { nil }
             self.stub(:to_param) { nil }

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.5"
+  s.version = "2.0.0.beta.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-04-04}
+  s.date = %q{2010-04-12}
   s.description = %q{Rspec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "features/model_specs/transactional_examples.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
+     "lib/autotest/rails_rspec2.rb",
      "lib/generators/rspec.rb",
      "lib/generators/rspec/controller/controller_generator.rb",
      "lib/generators/rspec/controller/templates/controller_spec.rb",
@@ -32,9 +33,9 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/helper_generator.rb",
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
+     "lib/generators/rspec/install/templates/autotest/discover.rb",
      "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
      "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
-     "lib/generators/rspec/install/templates/spec/spec.opts",
      "lib/generators/rspec/install/templates/spec/spec_helper.rb",
      "lib/generators/rspec/integration/integration_generator.rb",
      "lib/generators/rspec/integration/templates/request_spec.rb",
@@ -70,6 +71,9 @@ Gem::Specification.new do |s|
      "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_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/transactional_database_support_spec.rb",
      "spec/spec_helper.rb",
      "specs.watchr",
@@ -79,7 +83,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.5!
+  Thank you for installing rspec-rails-2.0.0.beta.6!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -94,11 +98,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.5}
+  s.summary = %q{rspec-rails-2.0.0.beta.6}
   s.test_files = [
     "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_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/transactional_database_support_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -108,14 +115,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.5"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.5"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.5"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

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

@@ -0,0 +1,26 @@
+module NoConnections
+  def self.included(mod)
+    (class << mod; self; end).class_eval do
+      def columns
+        []
+      end
+
+      def connection
+        Rspec::Mocks::Mock.new.as_null_object
+      end
+    end
+  end
+end
+
+class MockableModel < ActiveRecord::Base
+  include NoConnections
+  has_one :associated_model
+end
+
+class SubMockableModel < MockableModel
+end
+
+class AssociatedModel < ActiveRecord::Base
+  include NoConnections
+  belongs_to :mockable_model
+end

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

@@ -0,0 +1,114 @@
+require 'spec_helper'
+require File.dirname(__FILE__) + '/ar_classes'
+
+describe "mock_model" do
+  describe "responding to interrogation" do
+    before(:each) do
+      @model = mock_model(SubMockableModel)
+    end
+    it "should say it is_a? if it is" do
+      @model.is_a?(SubMockableModel).should be(true)
+    end
+    it "should say it is_a? if it's ancestor is" do
+      @model.is_a?(MockableModel).should be(true)
+    end
+    it "should say it is kind_of? if it is" do
+      @model.kind_of?(SubMockableModel).should be(true)
+    end
+    it "should say it is kind_of? if it's ancestor is" do
+      @model.kind_of?(MockableModel).should be(true)
+    end
+    it "should say it is instance_of? if it is" do
+      @model.instance_of?(SubMockableModel).should be(true)
+    end
+    it "should not say it instance_of? if it isn't, even if it's ancestor is" do
+      @model.instance_of?(MockableModel).should be(false)
+    end
+    it "should say it is not destroyed" do
+      @model.destroyed?(SubMockableModel).should be(false)
+    end
+    it "should say it is not marked_for_destruction" do
+      @model.marked_for_destruction?.should be(false)
+    end
+  end
+
+  describe "with params" do
+    it "should not mutate its parameters" do
+      params = {:a => 'b'}
+      model = mock_model(MockableModel, params)
+      params.should == {:a => 'b'}
+    end
+  end
+
+  describe "with #id stubbed", :type => :view do
+    before(:each) do
+      @model = mock_model(MockableModel, :id => 1)
+    end
+    it "should be named using the stubbed id value" do
+      @model.instance_variable_get(:@name).should == "MockableModel_1"
+    end
+    it "should return string of id value for to_param" do
+      @model.to_param.should == "1"
+    end
+  end
+
+  describe "as association", :type => :view do
+    before(:each) do
+      @real = AssociatedModel.create!
+      @mock_model = mock_model(MockableModel)
+      @real.mockable_model = @mock_model
+    end
+
+    it "should pass associated_model == mock" do
+        @mock_model.should == @real.mockable_model
+    end
+
+    it "should pass mock == associated_model" do
+        @real.mockable_model.should == @mock_model
+    end
+  end
+
+  describe "with :null_object => true", :type => :view do
+    before(:each) do
+      @model = mock_model(MockableModel, :null_object => true, :mocked_method => "mocked")
+    end
+
+    it "should be able to mock methods" do
+      @model.mocked_method.should == "mocked"
+    end
+    it "should return itself to unmocked methods" do
+      @model.unmocked_method.should equal(@model)
+    end
+  end
+
+  describe "#as_null_object", :type => :view do
+    before(:each) do
+      @model = mock_model(MockableModel, :mocked_method => "mocked").as_null_object
+    end
+
+    it "should be able to mock methods" do
+      @model.mocked_method.should == "mocked"
+    end
+    it "should return itself to unmocked methods" do
+      @model.unmocked_method.should equal(@model)
+    end
+  end
+
+  describe "#as_new_record" do
+    it "should say it is a new record" do
+      m = mock_model(MockableModel)
+      m.as_new_record.should be_new_record
+    end
+
+    it "should have a nil id" do
+      mock_model(MockableModel).as_new_record.id.should be(nil)
+    end
+
+    it "should return nil for #to_param" do
+      mock_model(MockableModel).as_new_record.to_param.should be(nil)
+    end
+  end
+end
+
+
+

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

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require File.dirname(__FILE__) + '/ar_classes'
+
+describe "stub_model" do
+  describe "defaults" do
+    it "should have an id" do
+      stub_model(MockableModel).id.should be > 0
+    end
+  
+    it "should say it is not a new record" do
+      stub_model(MockableModel).should_not be_new_record
+    end
+  end
+  
+  it "should accept a stub id" do
+    stub_model(MockableModel, :id => 37).id.should == 37
+  end
+  
+  it "should say it is a new record when id is set to nil" do
+    stub_model(MockableModel, :id => nil).should be_new_record
+  end
+  
+  it "should accept any arbitrary stub" do
+    stub_model(MockableModel, :foo => "bar").foo.should == "bar"
+  end
+  
+  it "should accept a stub for save" do
+    stub_model(MockableModel, :save => false).save.should be(false)
+  end
+  
+  describe "#as_new_record" do
+    it "should say it is a new record" do
+      stub_model(MockableModel).as_new_record.should be_new_record
+    end
+
+    it "should have a nil id" do
+      stub_model(MockableModel).as_new_record.id.should be(nil)
+    end
+  end
+  
+  pending "should raise when hitting the db" do
+    lambda do
+      model = stub_model(MockableModel, :changed => true, :attributes_with_quotes => {'this' => 'that'})
+      model.save
+    end.should raise_error(Rspec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
+  end
+  
+  it "should increment the id" do
+    first = stub_model(MockableModel)
+    second = stub_model(MockableModel)
+    second.id.should == (first.id + 1)
+  end
+  
+  describe "as association" do
+    before(:each) do
+      @real = AssociatedModel.create!
+      @stub_model = stub_model(MockableModel)
+      @real.mockable_model = @stub_model
+    end
+
+    it "should pass associated_model == mock" do
+        @stub_model.should == @real.mockable_model
+    end
+
+    it "should pass mock == associated_model" do
+        @real.mockable_model.should == @stub_model
+    end
+  end
+
+  describe "with a block" do
+    it "should yield the model" do
+      model = stub_model(MockableModel) do |block_arg|
+        @block_arg = block_arg
+      end
+      model.should be(@block_arg)
+    end
+  end
+end
+
+

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 5
-  version: 2.0.0.beta.5
+  - 6
+  version: 2.0.0.beta.6
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 -03:00
+date: 2010-04-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 5
-        version: 2.0.0.beta.5
+        - 6
+        version: 2.0.0.beta.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - features/model_specs/transactional_examples.feature
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
+- lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
 - lib/generators/rspec/controller/templates/controller_spec.rb
@@ -75,9 +76,9 @@ files:
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
+- lib/generators/rspec/install/templates/autotest/discover.rb
 - lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt
 - lib/generators/rspec/install/templates/lib/tasks/rspec.rake
-- lib/generators/rspec/install/templates/spec/spec.opts
 - lib/generators/rspec/install/templates/spec/spec_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/integration/templates/request_spec.rb
@@ -113,6 +114,9 @@ files:
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_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/transactional_database_support_spec.rb
 - spec/spec_helper.rb
 - specs.watchr
@@ -125,7 +129,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.5!
+    Thank you for installing rspec-rails-2.0.0.beta.6!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -162,10 +166,13 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.5
+summary: rspec-rails-2.0.0.beta.6
 test_files: 
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_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/transactional_database_support_spec.rb
 - spec/spec_helper.rb

data/lib/generators/rspec/install/templates/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format progress