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

[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 c61bd607dcce10e92e5ab7c85ccb38cf22cf84d4..d6f1dcce5698acaed266f2c3da979e2dc0179c44 100644 (file)
--- 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
 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
   # 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.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


@@ -17,9 +15,9 @@ 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|
+    [1, 255].each do |i|

       up = UserPreference.new
       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?


@@ -35,10 +33,10 @@ 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
       up.k = key * i
       up.v = val * i

-      assert_equal false, up.valid?
+      assert_not up.valid?

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