cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update for API change in CPK 7.x

Browse source
This commit is contained in:
Tom Hughes 2014-05-28 00:44:26 +01:00
parent 6a198d47aa
commit dd81b09eba
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/user_preference_controller.rb
View file

@ -26,7 +26,7 @@ class UserPreferenceController < ApplicationController
## ##
# return the value for a single preference # return the value for a single preference
def read_one 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" render :text => pref.v.to_s, :content_type => "text/plain"
end end
@ -69,7 +69,7 @@ class UserPreferenceController < ApplicationController
# update the value of a single preference # update the value of a single preference
def update_one def update_one
begin begin
pref = UserPreference.find(@user.id, params[:preference_key]) pref = UserPreference.find([@user.id, params[:preference_key]])
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
pref = UserPreference.new pref = UserPreference.new
pref.user = @user pref.user = @user
@ -85,7 +85,7 @@ class UserPreferenceController < ApplicationController
## ##
# delete a single preference # delete a single preference
def delete_one 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" render :text => "", :content_type => "text/plain"
end end

26
test/controllers/user_preference_controller_test.rb
View file

@ -92,10 +92,10 @@ class UserPreferenceControllerTest < ActionController::TestCase
put :update put :update
end end
assert_response :unauthorized, "should be authenticated" assert_response :unauthorized, "should be authenticated"
assert_equal "value", UserPreference.find(1, "key").v assert_equal "value", UserPreference.find([1, "key"]).v
assert_equal "some_value", UserPreference.find(1, "some_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 end
# authenticate as a user with preferences # authenticate as a user with preferences
@ -109,10 +109,10 @@ class UserPreferenceControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_equal "text/plain", @response.content_type assert_equal "text/plain", @response.content_type
assert_equal "", @response.body assert_equal "", @response.body
assert_equal "new_value", UserPreference.find(1, "key").v assert_equal "new_value", UserPreference.find([1, "key"]).v
assert_equal "value", UserPreference.find(1, "new_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 end
# try a put with duplicate keys # try a put with duplicate keys
@ -123,7 +123,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
assert_response :bad_request assert_response :bad_request
assert_equal "text/plain", @response.content_type assert_equal "text/plain", @response.content_type
assert_equal "Duplicate preferences with key key", @response.body 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 # try a put with invalid content
assert_no_difference "UserPreference.count" do assert_no_difference "UserPreference.count" do
@ -143,7 +143,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
end end
assert_response :unauthorized, "should be authenticated" assert_response :unauthorized, "should be authenticated"
assert_raises ActiveRecord::RecordNotFound do assert_raises ActiveRecord::RecordNotFound do
UserPreference.find(1, "new_key") UserPreference.find([1, "new_key"])
end end
# authenticate as a user with preferences # authenticate as a user with preferences
@ -157,7 +157,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_equal "text/plain", @response.content_type assert_equal "text/plain", @response.content_type
assert_equal "", @response.body 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 # try changing the value of a preference
assert_no_difference "UserPreference.count" do assert_no_difference "UserPreference.count" do
@ -167,7 +167,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_equal "text/plain", @response.content_type assert_equal "text/plain", @response.content_type
assert_equal "", @response.body 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" delete :delete_one, :preference_key => "key"
end end
assert_response :unauthorized, "should be authenticated" 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 # authenticate as a user with preferences
basic_authorization("test@openstreetmap.org", "test") basic_authorization("test@openstreetmap.org", "test")
@ -191,7 +191,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
assert_equal "text/plain", @response.content_type assert_equal "text/plain", @response.content_type
assert_equal "", @response.body assert_equal "", @response.body
assert_raises ActiveRecord::RecordNotFound do assert_raises ActiveRecord::RecordNotFound do
UserPreference.find(1, "key") UserPreference.find([1, "key"])
end end
# try the delete again for the same key # try the delete again for the same key
@ -200,7 +200,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
end end
assert_response :not_found assert_response :not_found
assert_raises ActiveRecord::RecordNotFound do assert_raises ActiveRecord::RecordNotFound do
UserPreference.find(1, "key") UserPreference.find([1, "key"])
end end
end end
end end