X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/72ae20ea3cd2c4534de5a99cc5e963ae9484bc62..212fe75b6fd26d01dfacf31650e7f71eb7f06a63:/test/models/user_preference_test.rb

diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb
index c61bd607d..ee91777c7 100644
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,13 +1,11 @@
 require "test_helper"
 
 class UserPreferenceTest < ActiveSupport::TestCase
-  api_fixtures
-
   # 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.user = users(:normal_user)
+    new_up = build(:user_preference)
+    new_up.user = up.user
     new_up.k = up.k
     new_up.v = "some other value"
     assert_not_equal new_up.v, up.v
@@ -17,12 +15,12 @@ class UserPreferenceTest < ActiveSupport::TestCase
   def test_check_valid_length
     key = "k"
     val = "v"
-    (1..255).each do |i|
-      up = UserPreference.new
-      up.user = users(:normal_user)
+    [1, 255].each do |i|
+      up = build(:user_preference)
+      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"
@@ -34,11 +32,11 @@ class UserPreferenceTest < ActiveSupport::TestCase
     key = "k"
     val = "v"
     [0, 256].each do |i|
-      up = UserPreference.new
-      up.user = users(:normal_user)
+      up = build(:user_preference)
+      up.user = create(:user)
       up.k = key * i
       up.v = val * i
-      assert_equal false, up.valid?
+      assert_not_predicate up, :valid?
       assert_raise(ActiveRecord::RecordInvalid) { up.save! }
     end
   end