From dd81b09ebaae296f5dc29cf991944b38e3c80c8c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 28 May 2014 00:44:26 +0100 Subject: [PATCH] Update for API change in CPK 7.x --- app/controllers/user_preference_controller.rb | 6 ++--- .../user_preference_controller_test.rb | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb index 059f00bbe..a3face30d 100644 --- a/app/controllers/user_preference_controller.rb +++ b/app/controllers/user_preference_controller.rb @@ -26,7 +26,7 @@ class UserPreferenceController < ApplicationController ## # return the value for a single preference def read_one - pref = UserPreference.find(@user.id, params[:preference_key]) + pref = UserPreference.find([@user.id, params[:preference_key]]) render :text => pref.v.to_s, :content_type => "text/plain" end @@ -69,7 +69,7 @@ class UserPreferenceController < ApplicationController # update the value of a single preference def update_one begin - pref = UserPreference.find(@user.id, params[:preference_key]) + pref = UserPreference.find([@user.id, params[:preference_key]]) rescue ActiveRecord::RecordNotFound pref = UserPreference.new pref.user = @user @@ -85,7 +85,7 @@ class UserPreferenceController < ApplicationController ## # delete a single preference def delete_one - UserPreference.find(@user.id, params[:preference_key]).delete + UserPreference.find([@user.id, params[:preference_key]]).delete render :text => "", :content_type => "text/plain" end diff --git a/test/controllers/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb index f8cafe6a9..4966ae748 100644 --- a/test/controllers/user_preference_controller_test.rb +++ b/test/controllers/user_preference_controller_test.rb @@ -92,10 +92,10 @@ class UserPreferenceControllerTest < ActionController::TestCase 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 - UserPreference.find(1, "new_key") + UserPreference.find([1, "new_key"]) 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_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 - UserPreference.find(1, "some_key") + UserPreference.find([1, "some_key"]) 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_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 @@ -143,7 +143,7 @@ class UserPreferenceControllerTest < ActionController::TestCase 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 @@ -157,7 +157,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([1, "new_key"]).v # 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_equal "newer_value", UserPreference.find(1, "new_key").v + assert_equal "newer_value", UserPreference.find([1, "new_key"]).v end ## @@ -178,7 +178,7 @@ class UserPreferenceControllerTest < ActionController::TestCase 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") @@ -191,7 +191,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([1, "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 - UserPreference.find(1, "key") + UserPreference.find([1, "key"]) end end end -- 2.43.2