Move check_block_buttons method to other private methods

[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 d3400bc9d4d8cc2bdba5bf68109435987b0fb1e2..ee91777c787813292f87c2e95fd8b3003973b040 100644 (file)
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,22 +1,11 @@
 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 4, 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)
-    new_up = UserPreference.new
-    new_up.user = users(:normal_user)
+    up = create(:user_preference)
+    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
     new_up.k = up.k
     new_up.v = "some other value"
     assert_not_equal new_up.v, up.v


@@ -26,12 +15,12 @@ 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|
-      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
       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"
       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"


@@ -43,11 +32,11 @@ class UserPreferenceTest < ActiveSupport::TestCase
     key = "k"
     val = "v"
     [0, 256].each do |i|
     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
       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
       assert_raise(ActiveRecord::RecordInvalid) { up.save! }
     end
   end