Merge remote-tracking branch 'upstream/pull/5150'

[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 13db86e28134ecf899e19d21a147dfac5fc90d8c..5147733e3edc4c50d46b9ac49992f050f976d100 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -7,7 +7,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
     get "/api/#{Settings.api_version}/user/details"
     assert_response :unauthorized
 
     get "/api/#{Settings.api_version}/user/details"
     assert_response :unauthorized
 

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

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


@@ -18,7 +18,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :ends_at => Time.now.utc + 5.minutes,
       :deactivates_at => Time.now.utc + 5.minutes
     )
       :ends_at => Time.now.utc + 5.minutes,
       :deactivates_at => Time.now.utc + 5.minutes
     )

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

     assert_response :forbidden
   end
 
     assert_response :forbidden
   end
 


@@ -33,18 +33,19 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
       :ends_at => Time.now.utc + 5.minutes,
       :deactivates_at => Time.now.utc + 5.minutes
     )
       :ends_at => Time.now.utc + 5.minutes,
       :deactivates_at => Time.now.utc + 5.minutes
     )

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

     assert_response :forbidden
 
     # revoke the ban
     get "/login"
     assert_response :success
     assert_response :forbidden
 
     # revoke the ban
     get "/login"
     assert_response :success

-    post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/blocks/#{block.id}/revoke" }
+    post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/user_blocks/#{block.id}/edit" }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

-    assert_template "user_blocks/revoke"
-    post "/blocks/#{block.id}/revoke", :params => { "confirm" => "yes" }
+    assert_template "user_blocks/edit"
+    put "/user_blocks/#{block.id}", :params => { :user_block_period => "0",
+                                                 :user_block => { :needs_view => false, :reason => "Unblocked" } }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -52,7 +53,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/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/details", :headers => bearer_authorization_header(blocked_user)

     assert_response :success
   end
 end
     assert_response :success
   end
 end