shoulda 2.10.1 → 2.10.2

data/test/matchers/controller/respond_with_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class RespondWithMatcherTest < Test::Unit::TestCase # :nodoc:
+class RespondWithMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller responding with success" do
     setup do

data/test/matchers/controller/route_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class RouteToMatcherTest < Test::Unit::TestCase # :nodoc:
+class RouteToMatcherTest < ActionController::TestCase # :nodoc:
 
   context "given a controller with a defined route" do
     setup do

data/test/matchers/controller/set_session_matcher_test.rb

@@ -1,10 +1,13 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class SetSessionMatcherTest < Test::Unit::TestCase # :nodoc:
+class SetSessionMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that sets a session variable" do
     setup do
-      @controller = build_response { session[:var] = 'value' }
+      @controller = build_response do
+        session[:var] = 'value'
+        session[:false_var] = false
+      end
     end
 
     should "accept assigning to that variable" do
@@ -26,6 +29,10 @@ class SetSessionMatcherTest < Test::Unit::TestCase # :nodoc:
     should "accept assigning nil to another variable" do
       assert_accepts set_session(:other).to(nil), @controller
     end
+
+    should "accept assigning false to that variable" do
+      assert_accepts set_session(:false_var).to(false), @controller
+    end
   end
 
 end

data/test/matchers/controller/set_the_flash_matcher.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class SetTheFlashMatcherTest < Test::Unit::TestCase # :nodoc:
+class SetTheFlashMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that sets a flash message" do
     setup do

data/test/model_builder.rb

@@ -1,4 +1,4 @@
-class Test::Unit::TestCase  
+class ActiveSupport::TestCase  
   def create_table(table_name, &block)
     connection = ActiveRecord::Base.connection
     

data/test/other/autoload_macro_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class AutoloadMacroTest < Test::Unit::TestCase # :nodoc:
+class AutoloadMacroTest < ActiveSupport::TestCase # :nodoc:
   context "The macro auto-loader" do
     should "load macros from the plugins" do
       assert self.class.respond_to?('plugin_macro')

data/test/other/context_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class ContextTest < Test::Unit::TestCase # :nodoc:
+class ContextTest < ActiveSupport::TestCase # :nodoc:
   
   def self.context_macro(&blk)
     context "with a subcontext made by a macro" do
@@ -142,4 +142,48 @@ class ContextTest < Test::Unit::TestCase # :nodoc:
       should_eventually "only print this statement once for a should_eventually"
     end
   end
+
+  class ::SomeModel; end
+
+  context "given a test named after a class" do
+    setup do
+      self.class.stubs(:name).returns("SomeModelTest")
+    end
+
+    should "determine the described type" do
+      assert_equal SomeModel, self.class.described_type
+    end
+
+    should "return a new instance of the described type as the subject if none exists" do
+      assert_kind_of SomeModel, subject
+    end
+
+    should "return an existing instance of the described type as the subject" do
+      @some_model = SomeModel.new
+      assert_equal @some_model, subject
+    end
+
+    context "with an explicit subject block" do
+      setup { @expected = SomeModel.new }
+      subject { @expected }
+      should "return the result of the block as the subject" do
+        assert_equal @expected, subject
+      end
+    end
+  end
+end
+
+class Subject; end
+
+class SubjectTest < ActiveSupport::TestCase
+
+  def setup
+    @expected = Subject.new
+  end
+
+  subject { @expected }
+
+  should "return a specified subject" do
+    assert_equal @expected, subject
+  end
 end

data/test/other/convert_to_should_syntax_test.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
 
-class ConvertToShouldSyntaxTest < Test::Unit::TestCase # :nodoc:
+class ConvertToShouldSyntaxTest < ActiveSupport::TestCase # :nodoc:
 
   BEFORE_FIXTURE = <<-EOS
-    class DummyTest < Test::Unit::TestCase
+    class DummyTest < ActiveSupport::TestCase
 
       should "Not change this_word_with_underscores" do
       end
@@ -23,7 +23,7 @@ class ConvertToShouldSyntaxTest < Test::Unit::TestCase # :nodoc:
   EOS
 
   AFTER_FIXTURE = <<-EOS
-    class DummyTest < Test::Unit::TestCase
+    class DummyTest < ActiveSupport::TestCase
 
       should "Not change this_word_with_underscores" do
       end

data/test/other/helpers_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 require 'action_mailer'
 require 'mocha'
 
-class HelpersTest < Test::Unit::TestCase # :nodoc:
+class HelpersTest < ActiveSupport::TestCase # :nodoc:
 
   context "given delivered emails" do
     setup do
@@ -88,6 +88,13 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
         @a.push(4)
       end
 
+      should_change("the number of elements", :by => 1) { @a.length }
+      should_change("the number of elements", :from => 3) { @a.length }
+      should_change("the number of elements", :to => 4) { @a.length }
+      should_change("the first element", :by => 0) { @a[0] }
+      should_not_change("the first element") { @a[0] }
+
+      # tests for deprecated behavior
       should_change "@a.length", :by => 1
       should_change "@a.length", :from => 3
       should_change "@a.length", :to => 4
@@ -100,6 +107,14 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
         @a = %w(a b c d e f)
       end
 
+      should_change("the number of elements", :by => 3) { @a.length }
+      should_change("the number of elements", :from => 3, :to => 6, :by => 3) { @a.length }
+      should_change("the first element") { @a[0] }
+      should_change("the second element", :from => 2, :to => "b") { @a[1] }
+      should_change("the third element", :from => /\d/, :to => /\w/) { @a[2] }
+      should_change("the last element", :to => String) { @a[3] }
+
+      # tests for deprecated behavior
       should_change "@a.length", :by => 3
       should_change "@a.length", :from => 3, :to => 6, :by => 3
       should_change "@a[0]"
@@ -188,10 +203,20 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
                                  :negative_failure_message => 'big time failure')
     end
 
-    should "pass when given to assert_accepts" do
+    should "pass when given to assert_accepts with no message expectation" do
       assert_accepts @matcher, 'target'
     end
 
+    should "pass when given to assert_accepts with a matching message" do
+      assert_accepts @matcher, 'target', :message => /big time/
+    end
+
+    should "fail when given to assert_accepts with non-matching message" do
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_accepts @matcher, 'target', :message => /small time/
+      end
+    end
+
     context "when given to assert_rejects" do
       setup do
         begin
@@ -217,10 +242,20 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
                                  :negative_failure_message => 'bad failure message')
     end
 
-    should "pass when given to assert_rejects" do
+    should "pass when given to assert_rejects with no message expectation" do
       assert_rejects @matcher, 'target'
     end
 
+    should "pass when given to assert_rejects with a matching message" do
+      assert_rejects @matcher, 'target', :message => /big time/
+    end
+
+    should "fail when given to assert_rejects with a non-matching message" do
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_rejects @matcher, 'target', :message => /small time/
+      end
+    end
+
     context "when given to assert_accepts" do
       setup do
         begin
@@ -238,4 +273,68 @@ class HelpersTest < Test::Unit::TestCase # :nodoc:
       end
     end
   end
+
+  context "given one treat exists and one post exists" do
+    setup do
+      Treat.create!
+      Post.create!(:title => 'title', :body => 'body', :user_id => 1)
+    end
+
+    teardown do
+      Treat.delete_all
+      Post.delete_all
+    end
+
+    context "creating a treat" do
+      setup do
+        Treat.create!
+      end
+
+      should_create :treat
+      should_fail do
+        should_create :post
+      end
+    end
+
+    context "creating a treat and a post" do
+      setup do
+        Treat.create!
+        Post.create!(:title => 'title 2', :body => 'body', :user_id => 1)
+      end
+
+      should_create :treat
+      should_create :post
+    end
+
+    context "destroying a treat" do
+      setup do
+        Treat.first.destroy
+      end
+
+      should_destroy :treat
+      should_fail do
+        should_destroy :post
+      end
+    end
+
+    context "destroying a treat and a post" do
+      setup do
+        Treat.first.destroy
+        Post.first.destroy
+      end
+
+      should_destroy :treat
+      should_destroy :post
+    end
+
+    context "doing nothing" do
+      should_fail do
+        should_create :treat
+      end
+
+      should_fail do
+        should_destroy :treat
+      end
+    end
+  end
 end

data/test/other/private_helpers_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class PrivateHelpersTest < Test::Unit::TestCase # :nodoc:
+class PrivateHelpersTest < ActiveSupport::TestCase # :nodoc:
   include Shoulda::Private
   context "get_options!" do
     should "remove opts from args" do
@@ -22,13 +22,11 @@ class PrivateHelpersTest < Test::Unit::TestCase # :nodoc:
         get_options!(args, :one)
       end
     end
-  end
-
-  class ::SomeModel; end
-  context "model_class" do
-    should "sniff the class constant from the test class" do
-      self.expects(:name).returns("SomeModelTest")
-      assert_equal SomeModel, model_class
+    
+    should "return single wanted option" do
+      args = [:a, :b, {:class => Object}]
+      klass = get_options!(args,:class)
+      assert_equal Object, klass
     end
   end
 end

data/test/other/should_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class ShouldTest < Test::Unit::TestCase # :nodoc:
+class ShouldTest < ActiveSupport::TestCase # :nodoc:
   should "be able to define a should statement outside of a context" do
     assert true
   end
@@ -15,6 +15,10 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
     end
   end
 
+  def self.should_be_able_to_setup_a_should_eventually_in_a_class_method
+    should "be able to setup a should eventually in a class method"
+  end
+
   def self.should_see_a_context_block_like_a_Test_Unit_class
     should "see a context block as a Test::Unit class" do
       assert_equal "ShouldTest", self.class.name
@@ -46,6 +50,7 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
     should_see_class_methods
     should_see_a_context_block_like_a_Test_Unit_class
     should_be_able_to_make_context_macros("Context ")
+    should_be_able_to_setup_a_should_eventually_in_a_class_method
 
     should "not define @blah" do
       assert ! self.instance_variables.include?("@blah")
@@ -177,7 +182,7 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
   end
 
   def test_should_create_test_methods_on_build
-    tu_class = Test::Unit::TestCase
+    tu_class = ActiveSupport::TestCase
     context = Shoulda::Context.new("A Context", tu_class) do
       should "define the test" do; end
     end
@@ -187,7 +192,7 @@ class ShouldTest < Test::Unit::TestCase # :nodoc:
   end
 
   def test_should_create_test_methods_on_build_when_subcontext
-    tu_class = Test::Unit::TestCase
+    tu_class = ActiveSupport::TestCase
     context = Shoulda::Context.new("A Context", tu_class) do
       context "with a child" do
         should "define the test" do; end

data/test/rails_root/app/controllers/posts_controller.rb

@@ -12,6 +12,7 @@ class PostsController < ApplicationController
         headers['Content-Type'] = 'application/rss+xml'
         session[:special] = '$2 off your next purchase'
         session[:special_user_id] = @user.id
+        session[:false_var] = false
         head :ok
       end
     end

data/test/rails_root/app/models/pets/cat.rb

@@ -0,0 +1,7 @@
+module Pets
+  class Cat < ActiveRecord::Base
+    belongs_to :owner, :class_name => 'User'
+    belongs_to :address, :dependent => :destroy
+    validates_presence_of :owner_id
+  end
+end

data/test/rails_root/app/models/profile.rb

@@ -0,0 +1,2 @@
+class Profile < ActiveRecord::Base
+end

data/test/rails_root/app/models/registration.rb

@@ -0,0 +1,2 @@
+class Registration < ActiveRecord::Base
+end

data/test/rails_root/app/models/user.rb

@@ -1,11 +1,14 @@
 class User < ActiveRecord::Base
   has_many :posts
   has_many :dogs, :foreign_key => :owner_id, :class_name => "Pets::Dog"
+  has_many :cats, :foreign_key => :owner_id, :class_name => "Pets::Cat"
 
   has_many :friendships
   has_many :friends, :through => :friendships
 
   has_one :address, :as => :addressable, :dependent => :destroy
+  has_one :registration
+  has_one :profile, :through => :registration
 
   named_scope :old,      :conditions => "age > 50"
   named_scope :eighteen, :conditions => { :age => 18 }

data/test/rails_root/config/boot.rb

@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -67,7 +68,7 @@ module Rails
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,14 +83,14 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         end
 
       rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
 

data/test/rails_root/config/environment.rb

@@ -1,6 +1,6 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 old_verbose, $VERBOSE = $VERBOSE, nil
-RAILS_GEM_VERSION = '= 2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '= 2.3.2' unless defined? RAILS_GEM_VERSION
 $VERBOSE = old_verbose
 
 require File.join(File.dirname(__FILE__), 'boot')
@@ -9,6 +9,10 @@ Rails::Initializer.run do |config|
   config.log_level = :debug
   config.cache_classes = false
   config.whiny_nils = true
+  config.action_controller.session = {
+    :key    => 'shoulda_session',
+    :secret => 'ceae6058a816b1446e09ce90d8372511'
+  }
 end
 
 # Dependencies.log_activity = true