X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2d13c075660efb9582d7fb600bd6798d7a382ca..1a1d924ae060f82567599b25b090a729d5c721e9:/test/controllers/user_preference_controller_test.rb

diff --git a/test/controllers/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb
index f8cafe6a9..fac864ae9 100644
--- a/test/controllers/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -1,8 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class UserPreferenceControllerTest < ActionController::TestCase
-  fixtures :users, :user_preferences
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -36,7 +34,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :unauthorized, "should be authenticated"
 
     # authenticate as a user with no preferences
-    basic_authorization("test@example.com", "test")
+    basic_authorization(create(:user).email, "test")
 
     # try the read again
     get :read
@@ -45,9 +43,12 @@ class UserPreferenceControllerTest < ActionController::TestCase
         assert_select "preference", :count => 0
       end
     end
-    
+
     # authenticate as a user with preferences
-    basic_authorization("test@openstreetmap.org", "test")
+    user = create(:user)
+    user_preference = create(:user_preference, :user => user)
+    user_preference2 = create(:user_preference, :user => user)
+    basic_authorization(user.email, "test")
 
     # try the read again
     get :read
@@ -56,8 +57,8 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_select "osm" do
       assert_select "preferences", :count => 1 do
         assert_select "preference", :count => 2
-        assert_select "preference[k=\"#{user_preferences(:a).k}\"][v=\"#{user_preferences(:a).v}\"]", :count => 1
-        assert_select "preference[k=\"#{user_preferences(:two).k}\"][v=\"#{user_preferences(:two).v}\"]", :count => 1
+        assert_select "preference[k=\"#{user_preference.k}\"][v=\"#{user_preference.v}\"]", :count => 1
+        assert_select "preference[k=\"#{user_preference2.k}\"][v=\"#{user_preference2.v}\"]", :count => 1
       end
     end
   end
@@ -65,12 +66,15 @@ class UserPreferenceControllerTest < ActionController::TestCase
   ##
   # test read_one action
   def test_read_one
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "key", :v => "value")
+
     # try a read without auth
     get :read_one, :preference_key => "key"
     assert_response :unauthorized, "should be authenticated"
 
     # authenticate as a user with preferences
-    basic_authorization("test@openstreetmap.org", "test")
+    basic_authorization(user.email, "test")
 
     # try the read again
     get :read_one, :preference_key => "key"
@@ -86,20 +90,24 @@ class UserPreferenceControllerTest < ActionController::TestCase
   ##
   # test update action
   def test_update
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "key", :v => "value")
+    create(:user_preference, :user => user, :k => "some_key", :v => "some_value")
+
     # try a put without auth
     assert_no_difference "UserPreference.count" do
       content "<osm><preferences><preference k='key' v='new_value'/><preference k='new_key' v='value'/></preferences></osm>"
       put :update
     end
     assert_response :unauthorized, "should be authenticated"
-    assert_equal "value", UserPreference.find(1, "key").v
-    assert_equal "some_value", UserPreference.find(1, "some_key").v
+    assert_equal "value", UserPreference.find([user.id, "key"]).v
+    assert_equal "some_value", UserPreference.find([user.id, "some_key"]).v
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find(1, "new_key")
+      UserPreference.find([user.id, "new_key"])
     end
 
     # authenticate as a user with preferences
-    basic_authorization("test@openstreetmap.org", "test")
+    basic_authorization(user.email, "test")
 
     # try the put again
     assert_no_difference "UserPreference.count" do
@@ -109,10 +117,10 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
-    assert_equal "new_value", UserPreference.find(1, "key").v
-    assert_equal "value", UserPreference.find(1, "new_key").v
+    assert_equal "new_value", UserPreference.find([user.id, "key"]).v
+    assert_equal "value", UserPreference.find([user.id, "new_key"]).v
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find(1, "some_key")
+      UserPreference.find([user.id, "some_key"])
     end
 
     # try a put with duplicate keys
@@ -123,7 +131,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :bad_request
     assert_equal "text/plain", @response.content_type
     assert_equal "Duplicate preferences with key key", @response.body
-    assert_equal "new_value", UserPreference.find(1, "key").v
+    assert_equal "new_value", UserPreference.find([user.id, "key"]).v
 
     # try a put with invalid content
     assert_no_difference "UserPreference.count" do
@@ -136,6 +144,9 @@ class UserPreferenceControllerTest < ActionController::TestCase
   ##
   # test update_one action
   def test_update_one
+    user = create(:user)
+    create(:user_preference, :user => user)
+
     # try a put without auth
     assert_no_difference "UserPreference.count" do
       content "new_value"
@@ -143,11 +154,11 @@ class UserPreferenceControllerTest < ActionController::TestCase
     end
     assert_response :unauthorized, "should be authenticated"
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find(1, "new_key")
+      UserPreference.find([user.id, "new_key"])
     end
 
     # authenticate as a user with preferences
-    basic_authorization("test@openstreetmap.org", "test")
+    basic_authorization(user.email, "test")
 
     # try adding a new preference
     assert_difference "UserPreference.count", 1 do
@@ -157,7 +168,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
-    assert_equal "new_value", UserPreference.find(1, "new_key").v
+    assert_equal "new_value", UserPreference.find([user.id, "new_key"]).v
 
     # try changing the value of a preference
     assert_no_difference "UserPreference.count" do
@@ -167,21 +178,24 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
-    assert_equal "newer_value", UserPreference.find(1, "new_key").v
+    assert_equal "newer_value", UserPreference.find([user.id, "new_key"]).v
   end
 
   ##
   # test delete_one action
   def test_delete_one
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "key", :v => "value")
+
     # try a delete without auth
     assert_no_difference "UserPreference.count" do
       delete :delete_one, :preference_key => "key"
     end
     assert_response :unauthorized, "should be authenticated"
-    assert_equal "value", UserPreference.find(1, "key").v
+    assert_equal "value", UserPreference.find([user.id, "key"]).v
 
     # authenticate as a user with preferences
-    basic_authorization("test@openstreetmap.org", "test")
+    basic_authorization(user.email, "test")
 
     # try the delete again
     assert_difference "UserPreference.count", -1 do
@@ -191,7 +205,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find(1, "key")
+      UserPreference.find([user.id, "key"])
     end
 
     # try the delete again for the same key
@@ -200,7 +214,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     end
     assert_response :not_found
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find(1, "key")
+      UserPreference.find([user.id, "key"])
     end
   end
 end