X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fd588cd715494092b5f55ac406f7dc69a1104ba9..b99b1926974a92935a14ecf046915e83421e3cd1:/test/models/user_preference_test.rb

diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb
index ee2dbf2d8..bceec0719 100644
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,26 +1,15 @@
 require "test_helper"
 
 class UserPreferenceTest < ActiveSupport::TestCase
-  api_fixtures
-  fixtures :user_preferences
-
-  # This checks to make sure that there are two user preferences
-  # stored in the test database.
-  # This test needs to be updated for every addition/deletion from
-  # the fixture file
-  def test_check_count
-    assert_equal 4, UserPreference.count
-  end
-
   # Checks that you cannot add a new preference, that is a duplicate
   def test_add_duplicate_preference
-    up = user_preferences(:a)
+    up = create(:user_preference)
     new_up = UserPreference.new
-    new_up.user = users(:normal_user)
+    new_up.user = up.user
     new_up.k = up.k
     new_up.v = "some other value"
     assert_not_equal new_up.v, up.v
-    assert_raise (ActiveRecord::RecordNotUnique) { new_up.save }
+    assert_raise(ActiveRecord::RecordNotUnique) { new_up.save }
   end
 
   def test_check_valid_length
@@ -28,7 +17,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
     val = "v"
     (1..255).each do |i|
       up = UserPreference.new
-      up.user = users(:normal_user)
+      up.user = create(:user)
       up.k = key * i
       up.v = val * i
       assert up.valid?
@@ -44,7 +33,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
     val = "v"
     [0, 256].each do |i|
       up = UserPreference.new
-      up.user = users(:normal_user)
+      up.user = create(:user)
       up.k = key * i
       up.v = val * i
       assert_equal false, up.valid?