Changeset 1507
- Timestamp:
- 06/25/05 11:15:38 (3 years ago)
- Files:
-
- trunk/activesupport/lib/active_support/whiny_nil.rb (modified) (1 diff)
- trunk/activesupport/test/whiny_nil_test.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activesupport/lib/active_support/whiny_nil.rb
r1472 r1507 7 7 # was expected. 8 8 9 10 9 class NilClass 11 WHINERS = [ ActiveRecord::Base,Array ]10 WHINERS = [ ::ActiveRecord::Base, ::Array ] 12 11 13 12 @@method_class_map = Hash.new trunk/activesupport/test/whiny_nil_test.rb
r1455 r1507 1 1 require 'test/unit' 2 2 3 4 ## mock to enable testing without activerecord 3 # mock to enable testing without activerecord 5 4 module ActiveRecord 6 5 class Base … … 10 9 end 11 10 12 require 'active_support/whiny_nil' 13 14 11 require File.dirname(__FILE__) + '/../lib/active_support/inflector' 12 require File.dirname(__FILE__) + '/../lib/active_support/whiny_nil' 15 13 16 14 class WhinyNilTest < Test::Unit::TestCase 17 15 def test_unchanged 18 begin 19 nil.method_thats_not_in_whiners 20 rescue NoMethodError => nme 21 assert_match(/nil:NilClass/, nme.message) 22 end 16 nil.method_thats_not_in_whiners 17 rescue NoMethodError => nme 18 assert_match(/nil:NilClass/, nme.message) 23 19 end 24 20 25 21 def test_active_record 26 begin 27 nil.save! 28 rescue NoMethodError => nme 29 assert(!(nme.message =~ /nil:NilClass/)) 30 end 22 nil.save! 23 rescue NoMethodError => nme 24 assert(!(nme.message =~ /nil:NilClass/)) 31 25 end 32 26 33 27 def test_array 34 begin 35 nil.each 36 rescue NoMethodError => nme 37 assert(!(nme.message =~ /nil:NilClass/)) 38 end 28 nil.each 29 rescue NoMethodError => nme 30 assert(!(nme.message =~ /nil:NilClass/)) 31 end 32 33 def test_id 34 nil.id 35 rescue RuntimeError => nme 36 assert(!(nme.message =~ /nil:NilClass/)) 39 37 end 40 38 end