Update get/post etc to remove use of deprecated syntax

[rails.git] / 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 96ba4375c2d6fe59980ff37b9a34d6e98809d48e..2287993e820d7c2b99d7b32721055d044acdb42a 100644 (file)
--- a/test/controllers/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class UserPreferenceControllerTest < ActionController::TestCase
-  fixtures :users
-
   ##
   # 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("moderator@example.com", "test")
+    basic_authorization(create(:user).email, "test")
 
     # try the read again
     get :read
@@ -47,14 +45,15 @@ class UserPreferenceControllerTest < ActionController::TestCase
     end
 
     # authenticate as a user with preferences
-    user_preference = create(:user_preference, :user => users(:normal_user))
-    user_preference2 = create(:user_preference, :user => users(:normal_user))
-    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
     assert_response :success
-    assert_equal "text/xml", @response.content_type
+    assert_equal "application/xml", @response.content_type
     assert_select "osm" do
       assert_select "preferences", :count => 1 do
         assert_select "preference", :count => 2
@@ -67,31 +66,33 @@ class UserPreferenceControllerTest < ActionController::TestCase
   ##
   # test read_one action
   def test_read_one
-    create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value")
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "key", :v => "value")
 
     # try a read without auth
-    get :read_one, :preference_key => "key"
+    get :read_one, :params => { :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"
+    get :read_one, :params => { :preference_key => "key" }
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "value", @response.body
 
     # try the read again for a non-existent key
-    get :read_one, :preference_key => "unknown_key"
+    get :read_one, :params => { :preference_key => "unknown_key" }
     assert_response :not_found
   end
 
   ##
   # test update action
   def test_update
-    create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value")
-    create(:user_preference, :user => users(:normal_user), :k => "some_key", :v => "some_value")
+    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
@@ -99,14 +100,14 @@ class UserPreferenceControllerTest < ActionController::TestCase
       put :update
     end
     assert_response :unauthorized, "should be authenticated"
-    assert_equal "value", UserPreference.find([users(:normal_user).id, "key"]).v
-    assert_equal "some_value", UserPreference.find([users(:normal_user).id, "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([users(:normal_user).id, "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
@@ -116,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([users(:normal_user).id, "key"]).v
-    assert_equal "value", UserPreference.find([users(:normal_user).id, "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([users(:normal_user).id, "some_key"])
+      UserPreference.find([user.id, "some_key"])
     end
 
     # try a put with duplicate keys
@@ -130,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([users(:normal_user).id, "key"]).v
+    assert_equal "new_value", UserPreference.find([user.id, "key"]).v
 
     # try a put with invalid content
     assert_no_difference "UserPreference.count" do
@@ -143,73 +144,77 @@ 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"
-      put :update_one, :preference_key => "new_key"
+      put :update_one, :params => { :preference_key => "new_key" }
     end
     assert_response :unauthorized, "should be authenticated"
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find([users(:normal_user).id, "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
       content "new_value"
-      put :update_one, :preference_key => "new_key"
+      put :update_one, :params => { :preference_key => "new_key" }
     end
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
-    assert_equal "new_value", UserPreference.find([users(:normal_user).id, "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
       content "newer_value"
-      put :update_one, :preference_key => "new_key"
+      put :update_one, :params => { :preference_key => "new_key" }
     end
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
-    assert_equal "newer_value", UserPreference.find([users(:normal_user).id, "new_key"]).v
+    assert_equal "newer_value", UserPreference.find([user.id, "new_key"]).v
   end
 
   ##
   # test delete_one action
   def test_delete_one
-    create(:user_preference, :user => users(:normal_user), :k => "key", :v => "value")
+    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"
+      delete :delete_one, :params => { :preference_key => "key" }
     end
     assert_response :unauthorized, "should be authenticated"
-    assert_equal "value", UserPreference.find([users(:normal_user).id, "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
-      get :delete_one, :preference_key => "key"
+      get :delete_one, :params => { :preference_key => "key" }
     end
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find([users(:normal_user).id, "key"])
+      UserPreference.find([user.id, "key"])
     end
 
     # try the delete again for the same key
     assert_no_difference "UserPreference.count" do
-      get :delete_one, :preference_key => "key"
+      get :delete_one, :params => { :preference_key => "key" }
     end
     assert_response :not_found
     assert_raises ActiveRecord::RecordNotFound do
-      UserPreference.find([users(:normal_user).id, "key"])
+      UserPreference.find([user.id, "key"])
     end
   end
 end