X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dfbb95270782d4a290b77b7b513b5b7d9d52732a..84c898173778ece298b6bcd6d9839c207a831a86:/test/integration/user_blocks_test.rb

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index 38bb3338a..96dd879ee 100644
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,17 +1,13 @@
 require "test_helper"
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
-  def auth_header(user, pass)
-    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
-  end
-
   def test_api_blocked
     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
@@ -19,9 +15,9 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :user_id => blocked_user.id,
       :creator_id => create(:moderator_user).id,
       :reason => "testing",
-      :ends_at => Time.now.getutc + 5.minutes
+      :ends_at => Time.now.utc + 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
 
@@ -33,20 +29,20 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :user_id => blocked_user.id,
       :creator_id => moderator.id,
       :reason => "testing",
-      :ends_at => Time.now.getutc + 5.minutes
+      :ends_at => Time.now.utc + 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"
     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"
+    post "/blocks/#{block.id}/revoke", :params => { "confirm" => "yes" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
@@ -54,7 +50,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
     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