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

[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 da6cd7666a5641363940ef09f1544358e97ed716..bceec0719718bdb36048ee7315f26159a942c028 100644 (file)
--- 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
 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 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 = 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
     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


@@ -28,7 +17,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
     val = "v"
     (1..255).each do |i|
       up = UserPreference.new
     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?
       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
     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?
       up.k = key * i
       up.v = val * i
       assert_equal false, up.valid?