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

[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 f8cafe6a9279a46ed3b7e942b951f3a480055cc5..752ec56cb33b6d6a8dfdd2a75e9a67a825e24792 100644 (file)
--- a/test/controllers/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"

 
 class UserPreferenceControllerTest < ActionController::TestCase
   fixtures :users, :user_preferences
 
 class UserPreferenceControllerTest < ActionController::TestCase
   fixtures :users, :user_preferences


@@ -36,7 +36,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :unauthorized, "should be authenticated"
 
     # authenticate as a user with no preferences
     assert_response :unauthorized, "should be authenticated"
 
     # authenticate as a user with no preferences

-    basic_authorization("test@example.com", "test")
+    basic_authorization("moderator@example.com", "test")

 
     # try the read again
     get :read
 
     # try the read again
     get :read


@@ -45,7 +45,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
         assert_select "preference", :count => 0
       end
     end
         assert_select "preference", :count => 0
       end
     end

-    
+

     # authenticate as a user with preferences
     basic_authorization("test@openstreetmap.org", "test")
 
     # authenticate as a user with preferences
     basic_authorization("test@openstreetmap.org", "test")
 


@@ -92,10 +92,10 @@ class UserPreferenceControllerTest < ActionController::TestCase
       put :update
     end
     assert_response :unauthorized, "should be authenticated"
       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([1, "key"]).v
+    assert_equal "some_value", UserPreference.find([1, "some_key"]).v

     assert_raises ActiveRecord::RecordNotFound do
     assert_raises ActiveRecord::RecordNotFound do

-      UserPreference.find(1, "new_key")
+      UserPreference.find([1, "new_key"])

     end
 
     # authenticate as a user with preferences
     end
 
     # authenticate as a user with preferences


@@ -109,10 +109,10 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     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([1, "key"]).v
+    assert_equal "value", UserPreference.find([1, "new_key"]).v

     assert_raises ActiveRecord::RecordNotFound do
     assert_raises ActiveRecord::RecordNotFound do

-      UserPreference.find(1, "some_key")
+      UserPreference.find([1, "some_key"])

     end
 
     # try a put with duplicate keys
     end
 
     # try a put with duplicate keys


@@ -123,7 +123,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_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([1, "key"]).v

 
     # try a put with invalid content
     assert_no_difference "UserPreference.count" do
 
     # try a put with invalid content
     assert_no_difference "UserPreference.count" do


@@ -143,7 +143,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     end
     assert_response :unauthorized, "should be authenticated"
     assert_raises ActiveRecord::RecordNotFound do
     end
     assert_response :unauthorized, "should be authenticated"
     assert_raises ActiveRecord::RecordNotFound do

-      UserPreference.find(1, "new_key")
+      UserPreference.find([1, "new_key"])

     end
 
     # authenticate as a user with preferences
     end
 
     # authenticate as a user with preferences


@@ -157,7 +157,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     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([1, "new_key"]).v

 
     # try changing the value of a preference
     assert_no_difference "UserPreference.count" do
 
     # try changing the value of a preference
     assert_no_difference "UserPreference.count" do


@@ -167,7 +167,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     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([1, "new_key"]).v

   end
 
   ##
   end
 
   ##


@@ -178,7 +178,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
       delete :delete_one, :preference_key => "key"
     end
     assert_response :unauthorized, "should be authenticated"
       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([1, "key"]).v

 
     # authenticate as a user with preferences
     basic_authorization("test@openstreetmap.org", "test")
 
     # authenticate as a user with preferences
     basic_authorization("test@openstreetmap.org", "test")


@@ -191,7 +191,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     assert_raises ActiveRecord::RecordNotFound do
     assert_equal "text/plain", @response.content_type
     assert_equal "", @response.body
     assert_raises ActiveRecord::RecordNotFound do

-      UserPreference.find(1, "key")
+      UserPreference.find([1, "key"])

     end
 
     # try the delete again for the same key
     end
 
     # try the delete again for the same key


@@ -200,7 +200,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     end
     assert_response :not_found
     assert_raises ActiveRecord::RecordNotFound do
     end
     assert_response :not_found
     assert_raises ActiveRecord::RecordNotFound do

-      UserPreference.find(1, "key")
+      UserPreference.find([1, "key"])

     end
   end
 end
     end
   end
 end