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

[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 de35193f521f0c2339e8b301785118e3a74af8be..d3400bc9d4d8cc2bdba5bf68109435987b0fb1e2 100644 (file)
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class UserPreferenceTest < ActiveSupport::TestCase
   api_fixtures
@@ -9,18 +9,18 @@ class UserPreferenceTest < ActiveSupport::TestCase
   # This test needs to be updated for every addition/deletion from
   # the fixture file
   def test_check_count
-    assert_equal 2, UserPreference.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)
-    newUP = UserPreference.new
-    newUP.user = users(:normal_user)
-    newUP.k = up.k
-    newUP.v = "some other value"
-    assert_not_equal newUP.v, up.v
-    assert_raise (ActiveRecord::RecordNotUnique) { newUP.save }
+    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 }
   end
 
   def test_check_valid_length