shoulda 2.10.1 → 2.10.2

data/lib/shoulda/private_helpers.rb

@@ -7,14 +7,7 @@ module Shoulda # :nodoc:
       opts = (args.last.is_a?(Hash) ? args.pop : {})
       wanted.each {|w| ret << opts.delete(w)}
       raise ArgumentError, "Unsupported options given: #{opts.keys.join(', ')}" unless opts.keys.empty?
-      return *ret
-    end
-
-    # Returns the model class constant, as determined by the test class name.
-    #
-    #   class TestUser; model_class; end => User
-    def model_class
-      self.name.gsub(/Test$/, '').constantize
+      return wanted.size == 1 ? ret.first : ret
     end
   end
 end

data/lib/shoulda/test_unit.rb

@@ -1,3 +1,5 @@
+require 'test/unit'
+
 require 'shoulda/context'
 require 'shoulda/proc_extensions'
 require 'shoulda/assertions'
@@ -9,6 +11,7 @@ require 'shoulda/rails' if defined? RAILS_ROOT
 module Test # :nodoc: all
   module Unit
     class TestCase
+      include Shoulda::InstanceMethods
       extend Shoulda::ClassMethods
       include Shoulda::Assertions
       extend Shoulda::Macros

data/test/fail_macros.rb

@@ -13,7 +13,12 @@ module Shoulda
     #   end
     def should_fail(&block)
       context "should fail when trying to run:" do
-        Shoulda.expected_exceptions = [Test::Unit::AssertionFailedError]
+        if defined?(Test::Unit::AssertionFailedError)
+          failures = [Test::Unit::AssertionFailedError]
+        elsif defined?(MiniTest::Assertion)
+          failures = [MiniTest::Assertion]
+        end
+        Shoulda.expected_exceptions = failures
         yield block
         Shoulda.expected_exceptions = nil
       end

data/test/functional/posts_controller_test.rb

@@ -4,7 +4,7 @@ require 'posts_controller'
 # Re-raise errors caught by the controller.
 class PostsController; def rescue_action(e) raise e end; end
 
-class PostsControllerTest < Test::Unit::TestCase
+class PostsControllerTest < ActionController::TestCase
   fixtures :all
 
   def setup
@@ -43,14 +43,12 @@ class PostsControllerTest < Test::Unit::TestCase
         get :index, :user_id => users(:first)
       end
       should_respond_with :success
-      should_assign_to :user, :class => User, :equals => 'users(:first)'
+      should_assign_to :user, :class => User
+      should_render_template :index
       should_assign_to(:user) { users(:first) }
       should_fail do
         should_assign_to :user, :class => Post
       end
-      should_fail do
-        should_assign_to :user, :equals => 'posts(:first)'
-      end
       should_fail do
         should_assign_to(:user) { posts(:first) }
       end
@@ -69,20 +67,11 @@ class PostsControllerTest < Test::Unit::TestCase
       should_respond_with_content_type 'application/rss+xml'
       should_respond_with_content_type :rss
       should_respond_with_content_type /rss/
-      context "deprecated" do # to avoid redefining a test
-        should_return_from_session :special, "'$2 off your next purchase'"
-      end
-      should_fail do
-        should_return_from_session :special, "'not special'"
-      end
       should_set_session(:mischief) { nil }
-      should_return_from_session :malarky, "nil"
-      should_set_session :special, "'$2 off your next purchase'"
-      should_set_session :special_user_id, '@user.id'
-      context "with a block" do
-        should_set_session(:special_user_id) { @user.id }
-      end
-      should_fail do # to avoid redefining a test
+      should_set_session(:special) { '$2 off your next purchase' }
+      should_set_session(:special_user_id) { @user.id }
+      should_set_session(:false_var) { false }
+      should_fail do
         should_set_session(:special_user_id) { 'value' }
       end
       should_assign_to :user, :posts
@@ -96,11 +85,17 @@ class PostsControllerTest < Test::Unit::TestCase
         should_render_with_layout :wide
       end
       should_assign_to :false_flag
+      should_set_the_flash_to nil
+      should_fail do
+        should_set_the_flash_to /.*/
+      end
     end
 
     context "on GET to #new" do
       setup { get :new, :user_id => users(:first) }
       should_render_without_layout
+      should_not_set_the_flash
+      should_render_a_form
     end
 
     context "on POST to #create" do
@@ -110,14 +105,15 @@ class PostsControllerTest < Test::Unit::TestCase
                                     :body  => 'blah blah blah' }
       end
 
-      should_redirect_to 'user_post_url(@post.user, @post)'
       should_redirect_to('the created post') { user_post_url(users(:first),
                                                              assigns(:post)) }
       should_fail do
-        should_redirect_to 'user_posts_url(@post.user)'
+        should_redirect_to('elsewhere') { user_posts_url(users(:first)) }
       end
+
+      should_set_the_flash_to /success/
       should_fail do
-        should_redirect_to('elsewhere') { user_posts_url(users(:first)) }
+        should_not_set_the_flash
       end
     end
   end

data/test/functional/users_controller_test.rb

@@ -4,7 +4,7 @@ require 'users_controller'
 # Re-raise errors caught by the controller.
 class UsersController; def rescue_action(e) raise e end; end
 
-class UsersControllerTest < Test::Unit::TestCase
+class UsersControllerTest < ActionController::TestCase
   fixtures :all
 
   def setup

data/test/matchers/active_record/allow_mass_assignment_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class AllowMassAssignmentOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class AllowMassAssignmentOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute that is blacklisted from mass-assignment" do
     setup do

data/test/matchers/active_record/allow_value_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class AllowValueMatcherTest < Test::Unit::TestCase # :nodoc:
+class AllowValueMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute with a format validation" do
     setup do
@@ -38,4 +38,27 @@ class AllowValueMatcherTest < Test::Unit::TestCase # :nodoc:
     end
   end
 
+  context "an attribute with several validations" do
+    setup do
+      define_model :example, :attr => :string do
+        validates_presence_of     :attr
+        validates_length_of       :attr, :within => 1..5
+        validates_numericality_of :attr, :greater_than_or_equal_to => 1,
+                                         :less_than_or_equal_to    => 50000
+      end
+      @model = Example.new
+    end
+
+    should "allow a good value" do
+      assert_accepts allow_value("12345").for(:attr), @model
+    end
+    
+    bad_values = [nil, "", "abc", "0", "50001", "123456"]
+    bad_values.each do |value|
+      should "not allow a bad value (#{value.inspect})" do
+        assert_rejects allow_value(value).for(:attr), @model
+      end
+    end
+  end
+
 end

data/test/matchers/active_record/association_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class AssociationMatcherTest < Test::Unit::TestCase # :nodoc:
+class AssociationMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "belong_to" do
     setup do
@@ -126,7 +126,9 @@ class AssociationMatcherTest < Test::Unit::TestCase # :nodoc:
       define_model :parent do
         has_many :children
       end
-      assert_rejects @matcher.through(:conceptions), Parent.new
+      assert_rejects @matcher.through(:conceptions),
+        Parent.new,
+        :message => /does not have any relationship to conceptions/
     end
 
     should "reject an association that has the wrong :through option" do
@@ -137,9 +139,12 @@ class AssociationMatcherTest < Test::Unit::TestCase # :nodoc:
       end
       define_model :parent do
         has_many :conceptions
+        has_many :relationships
         has_many :children, :through => :conceptions
       end
-      assert_rejects @matcher.through(:relationships), Parent.new
+      assert_rejects @matcher.through(:relationships),
+                     Parent.new,
+                     :message => /through relationships, but got it through conceptions/
     end
 
     should "accept an association with a valid :dependent option" do

data/test/matchers/active_record/ensure_inclusion_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class EnsureInclusionOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class EnsureInclusionOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute which must be included in a range" do
     setup do

data/test/matchers/active_record/ensure_length_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class EnsureLengthOfMatcher < Test::Unit::TestCase # :nodoc:
+class EnsureLengthOfMatcher < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute with a non-zero minimum length validation" do
     setup do

data/test/matchers/active_record/have_db_column_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class HaveDbColumnMatcherTest < Test::Unit::TestCase # :nodoc:
+class HaveDbColumnMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "have_db_column" do
     setup do

data/test/matchers/active_record/{have_index_matcher_test.rb → have_db_index_matcher_test.rb}

@@ -1,10 +1,10 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class HaveIndexMatcherTest < Test::Unit::TestCase # :nodoc:
+class HaveDbIndexMatcherTest < ActiveSupport::TestCase # :nodoc:
   
-  context "have_index" do
+  context "have_db_index" do
     setup do
-      @matcher = have_index(:age)
+      @matcher = have_db_index(:age)
     end
 
     should "accept an existing index" do
@@ -22,9 +22,9 @@ class HaveIndexMatcherTest < Test::Unit::TestCase # :nodoc:
     end
   end
   
-  context "have_index with unique option" do
+  context "have_db_index with unique option" do
     setup do
-      @matcher = have_index(:ssn).unique(true)
+      @matcher = have_db_index(:ssn).unique(true)
     end
 
     should "accept an index of correct unique" do
@@ -46,9 +46,9 @@ class HaveIndexMatcherTest < Test::Unit::TestCase # :nodoc:
     end
   end
   
-  context "have_index on multiple columns" do
+  context "have_db_index on multiple columns" do
     setup do
-      @matcher = have_index([:geocodable_type, :geocodable_id])
+      @matcher = have_db_index([:geocodable_type, :geocodable_id])
     end
 
     should "accept an existing index" do
@@ -70,5 +70,22 @@ class HaveIndexMatcherTest < Test::Unit::TestCase # :nodoc:
       assert_rejects @matcher, Geocoding.new
     end
   end
+
+  should "join columns with and describing multiple columns" do
+    assert_match /on columns user_id and post_id/,
+      have_db_index([:user_id, :post_id]).description
+  end
+
+  should "describe a unique index as unique" do
+    assert_match /a unique index/, have_db_index(:user_id).unique(true).description
+  end
+
+  should "describe a non-unique index as non-unique" do
+    assert_match /a non-unique index/, have_db_index(:user_id).unique(false).description
+  end
+
+  should "not describe an index's uniqueness when it isn't important" do
+    assert_no_match /unique/, have_db_index(:user_id).description
+  end
   
 end

data/test/matchers/active_record/have_named_scope_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class HaveNamedScopeMatcherTest < Test::Unit::TestCase # :nodoc:
+class HaveNamedScopeMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute with a named scope" do
     setup do

data/test/matchers/active_record/have_readonly_attributes_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class HaveReadonlyAttributesMatcherTest < Test::Unit::TestCase # :nodoc:
+class HaveReadonlyAttributesMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute that cannot be set after being saved" do
     setup do

data/test/matchers/active_record/validate_acceptance_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class ValidateAcceptanceOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class ValidateAcceptanceOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "an attribute which must be accepted" do
     setup do

data/test/matchers/active_record/validate_format_of_matcher_test.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class ValidateFormatOfMatcherTest < ActiveSupport::TestCase # :nodoc:
+
+
+  context "a postal code" do
+    setup do
+      define_model :example, :attr => :string do
+        validates_format_of :attr, :with => /^\d{5}$/
+      end
+      @model = Example.new
+    end
+    
+    should "be valid" do
+      assert_accepts validate_format_of(:attr).with('12345'), @model
+    end
+    
+    should "not be valid with alpha in zip" do
+      assert_rejects validate_format_of(:attr).not_with('1234a'), @model, :message=>"is invalid"
+    end
+    
+    should "not be valid with to few digits" do
+      assert_rejects validate_format_of(:attr).not_with('1234'), @model, :message=>"is invalid"
+    end
+    
+    should "not be valid with to many digits" do
+      assert_rejects validate_format_of(:attr).not_with('123456'), @model, :message=>"is invalid"
+    end
+    
+    should "raise error if you try to call both with and not_with" do
+      assert_raise RuntimeError do
+        validate_format_of(:attr).not_with('123456').with('12345')
+      end
+    end
+    
+  end
+
+
+end

data/test/matchers/active_record/validate_numericality_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class ValidateNumericalityOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class ValidateNumericalityOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "a numeric attribute" do
     setup do

data/test/matchers/active_record/validate_presence_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class ValidatePresenceOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class ValidatePresenceOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "a required attribute" do
     setup do

data/test/matchers/active_record/validate_uniqueness_of_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class ValidateUniquenessOfMatcherTest < Test::Unit::TestCase # :nodoc:
+class ValidateUniquenessOfMatcherTest < ActiveSupport::TestCase # :nodoc:
 
   context "a unique attribute" do
     setup do

data/test/matchers/controller/assign_to_matcher_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class AssignToMatcherTest < Test::Unit::TestCase # :nodoc:
+class AssignToMatcherTest < ActionController::TestCase # :nodoc:
 
   context "a controller that assigns to an instance variable" do
     setup do

data/test/matchers/controller/filter_param_matcher_test.rb

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

data/test/matchers/controller/render_with_layout_matcher_test.rb

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

data/test/matchers/controller/respond_with_content_type_matcher_test.rb

@@ -1,27 +1,32 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
-class RespondWithContentTypeMatcherTest < Test::Unit::TestCase # :nodoc:
-  
+class RespondWithContentTypeMatcherTest < ActionController::TestCase # :nodoc:
+
   context "a controller responding with content type :xml" do
     setup do
       @controller = build_response { render :xml => { :user => "thoughtbot" }.to_xml }
     end
-    
+
     should "accept responding with content type :xml" do
       assert_accepts respond_with_content_type(:xml), @controller
     end
-    
+
     should "accept responding with content type 'application/xml'" do
       assert_accepts respond_with_content_type('application/xml'), @controller
     end
-    
+
     should "accept responding with content type /xml/" do
       assert_accepts respond_with_content_type(/xml/), @controller
     end
-    
+
     should "reject responding with another content type" do
       assert_rejects respond_with_content_type(:json), @controller
     end
   end
-  
+
+  should "generate the correct test name" do
+    assert_equal "respond with content type of application/xml",
+                 respond_with_content_type(:xml).description
+  end
+
 end