X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..255ce8708a4e9099f9a9eaa92278a40629a4d883:/test/integration/user_blocks_test.rb?ds=inline diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index db81117c3..ecadaad53 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -1,35 +1,29 @@ -require 'test_helper' +require "test_helper" class UserBlocksTest < ActionDispatch::IntegrationTest - fixtures :users, :user_blocks, :user_roles - - def auth_header(user, pass) - {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")} - end - def test_api_blocked - blocked_user = users(:public_user) + blocked_user = create(:user) - get "/api/#{API_VERSION}/user/details" + get "/api/#{Settings.api_version}/user/details" assert_response :unauthorized - get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") + get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :success # now block the user UserBlock.create( :user_id => blocked_user.id, - :creator_id => users(:moderator_user).id, + :creator_id => create(:moderator_user).id, :reason => "testing", :ends_at => Time.now.getutc + 5.minutes ) - get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") + get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :forbidden end def test_api_revoke - blocked_user = users(:public_user) - moderator = users(:moderator_user) + blocked_user = create(:user) + moderator = create(:moderator_user) block = UserBlock.create( :user_id => blocked_user.id, @@ -37,26 +31,26 @@ class UserBlocksTest < ActionDispatch::IntegrationTest :reason => "testing", :ends_at => Time.now.getutc + 5.minutes ) - get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") + get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :forbidden # revoke the ban - get '/login' + get "/login" assert_response :success - post '/login', {'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"} + post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/blocks/#{block.id}/revoke" } assert_response :redirect follow_redirect! assert_response :success - assert_template 'user_blocks/revoke' - post "/blocks/#{block.id}/revoke", {'confirm' => "yes"} + assert_template "user_blocks/revoke" + post "/blocks/#{block.id}/revoke", :params => { "confirm" => "yes" } assert_response :redirect follow_redirect! assert_response :success - assert_template 'user_blocks/show' + assert_template "user_blocks/show" reset! # access the API again. this time it should work - get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") + get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :success end end