Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 12 deletions

diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 2ce714fef0..41a1131bcb 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -101,25 +101,25 @@ class PresenceValidationTest < ActiveModel::TestCase
   def test_validates_format_of_with_lambda
     Topic.validates_format_of :content, :with => lambda{ |topic| topic.title == "digit" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "digit"
-    p.content = "Pixies"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "digit"
+    t.content = "Pixies"
+    assert t.invalid?
 
-    p.content = "1234"
-    assert p.valid?
+    t.content = "1234"
+    assert t.valid?
   end
 
   def test_validates_format_of_without_lambda
     Topic.validates_format_of :content, :without => lambda{ |topic| topic.title == "characters" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "characters"
-    p.content = "1234"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "characters"
+    t.content = "1234"
+    assert t.invalid?
 
-    p.content = "Pixies"
-    assert p.valid?
+    t.content = "Pixies"
+    assert t.valid?
   end
 
   def test_validates_format_of_for_ruby_class