Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley]

1 files changed, 7 insertions, 2 deletions

diff --git a/activesupport/test/core_ext/blank_test.rb b/activesupport/test/core_ext/blank_test.rb
index 1dbbf3ff30..ed6c625a0a 100644
--- a/activesupport/test/core_ext/blank_test.rb
+++ b/activesupport/test/core_ext/blank_test.rb
@@ -14,12 +14,17 @@ class BlankTest < Test::Unit::TestCase
   NOT   = [ EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], { nil => 0 } ]
 
   def test_blank
-    BLANK.each { |v| assert v.blank?, "#{v.inspect} should be blank" }
+    BLANK.each { |v| assert v.blank?,  "#{v.inspect} should be blank" }
     NOT.each   { |v| assert !v.blank?, "#{v.inspect} should not be blank" }
   end
 
   def test_present
     BLANK.each { |v| assert !v.present?, "#{v.inspect} should not be present" }
-    NOT.each   { |v| assert v.present?, "#{v.inspect} should be present" }
+    NOT.each   { |v| assert v.present?,  "#{v.inspect} should be present" }
+  end
+
+  def test_presence
+    BLANK.each { |v| assert_equal nil, v.presence, "#{v.inspect}.presence should return nil" }
+    NOT.each   { |v| assert_equal v,   v.presence, "#{v.inspect}.presence should return self" }
   end
 end