Fix some rubocop todos

[rails.git] / test / integration / user_blocks_test.rb

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index 4048d53034863c614a273becad8d97e98db43c08..ce67e74ba5455efef6efce6e91e869a8c747678b 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -2,16 +2,16 @@ require "test_helper"
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
   def auth_header(user, pass)
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
   def auth_header(user, pass)

-    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
+    { "HTTP_AUTHORIZATION" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }

   end
 
   def test_api_blocked
     blocked_user = create(:user)
 
   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
 
     assert_response :unauthorized
 

-    get "/api/#{API_VERSION}/user/details", :headers => auth_header(blocked_user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/details", :headers => auth_header(blocked_user.display_name, "test")

     assert_response :success
 
     # now block the user
     assert_response :success
 
     # now block the user


@@ -21,7 +21,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :reason => "testing",
       :ends_at => Time.now.getutc + 5.minutes
     )
       :reason => "testing",
       :ends_at => Time.now.getutc + 5.minutes
     )

-    get "/api/#{API_VERSION}/user/details", :headers => auth_header(blocked_user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/details", :headers => auth_header(blocked_user.display_name, "test")

     assert_response :forbidden
   end
 
     assert_response :forbidden
   end
 


@@ -35,7 +35,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :reason => "testing",
       :ends_at => Time.now.getutc + 5.minutes
     )
       :reason => "testing",
       :ends_at => Time.now.getutc + 5.minutes
     )

-    get "/api/#{API_VERSION}/user/details", :headers => auth_header(blocked_user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/details", :headers => auth_header(blocked_user.display_name, "test")

     assert_response :forbidden
 
     # revoke the ban
     assert_response :forbidden
 
     # revoke the ban


@@ -54,7 +54,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
     reset!
 
     # access the API again. this time it should work
     reset!
 
     # access the API again. this time it should work

-    get "/api/#{API_VERSION}/user/details", :headers => auth_header(blocked_user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/details", :headers => auth_header(blocked_user.display_name, "test")

     assert_response :success
   end
 end
     assert_response :success
   end
 end