Merge remote-tracking branch 'upstream/pull/5157'

[rails.git] / test / models / user_preference_test.rb

diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb
index 952289d940d20a30cf32df656c70bfb8ea0ccbfc..ee91777c787813292f87c2e95fd8b3003973b040 100644 (file)
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -4,7 +4,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
   # Checks that you cannot add a new preference, that is a duplicate
   def test_add_duplicate_preference
     up = create(:user_preference)
   # Checks that you cannot add a new preference, that is a duplicate
   def test_add_duplicate_preference
     up = create(:user_preference)

-    new_up = UserPreference.new
+    new_up = build(:user_preference)

     new_up.user = up.user
     new_up.k = up.k
     new_up.v = "some other value"
     new_up.user = up.user
     new_up.k = up.k
     new_up.v = "some other value"


@@ -15,12 +15,12 @@ class UserPreferenceTest < ActiveSupport::TestCase
   def test_check_valid_length
     key = "k"
     val = "v"
   def test_check_valid_length
     key = "k"
     val = "v"

-    (1..255).each do |i|
-      up = UserPreference.new
+    [1, 255].each do |i|
+      up = build(:user_preference)

       up.user = create(:user)
       up.k = key * i
       up.v = val * i
       up.user = create(:user)
       up.k = key * i
       up.v = val * i

-      assert up.valid?
+      assert_predicate up, :valid?

       assert up.save!
       resp = UserPreference.find(up.id)
       assert_equal key * i, resp.k, "User preference with #{i} #{key} chars (i.e. #{key.length * i} bytes) fails"
       assert up.save!
       resp = UserPreference.find(up.id)
       assert_equal key * i, resp.k, "User preference with #{i} #{key} chars (i.e. #{key.length * i} bytes) fails"


@@ -32,11 +32,11 @@ class UserPreferenceTest < ActiveSupport::TestCase
     key = "k"
     val = "v"
     [0, 256].each do |i|
     key = "k"
     val = "v"
     [0, 256].each do |i|

-      up = UserPreference.new
+      up = build(:user_preference)

       up.user = create(:user)
       up.k = key * i
       up.v = val * i
       up.user = create(:user)
       up.k = key * i
       up.v = val * i

-      assert_not up.valid?
+      assert_not_predicate up, :valid?

       assert_raise(ActiveRecord::RecordInvalid) { up.save! }
     end
   end
       assert_raise(ActiveRecord::RecordInvalid) { up.save! }
     end
   end