Merge remote-tracking branch 'openstreetmap/pull/1351'

[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 8d9d0da4eb5c6fc66cd58fd2bc5b7088091eed83..c61bd607dcce10e92e5ab7c85ccb38cf22cf84d4 100644 (file)
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,26 +1,17 @@
-require 'test_helper'
+require "test_helper"

 
 class UserPreferenceTest < ActiveSupport::TestCase
   api_fixtures
 
 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 2, UserPreference.count
-  end

 
   # Checks that you cannot add a new preference, that is a duplicate
   def test_add_duplicate_preference
 
   # 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.k = up.k
     new_up.v = "some other value"
     assert_not_equal new_up.v, up.v
     new_up = UserPreference.new
     new_up.user = users(:normal_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
   end
 
   def test_check_valid_length