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

[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 db81117c338d29816502a605259c4681d4ba0495..96717e092a79e4ae2dc3e5383aa5b8d83e7393e5 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,62 +1,59 @@
-require 'test_helper'
+require "test_helper"

 
 class UserBlocksTest < ActionDispatch::IntegrationTest
 
 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
   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
 
     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,
     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",
       :reason => "testing",

-      :ends_at => Time.now.getutc + 5.minutes
+      :ends_at => Time.now.utc + 5.minutes,
+      :deactivates_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
 
   def test_api_revoke
     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,
       :creator_id => moderator.id,
       :reason => "testing",
 
     block = UserBlock.create(
       :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,
+      :deactivates_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
     assert_response :forbidden
 
     # revoke the ban

-    get '/login'
+    get "/login"

     assert_response :success
     assert_response :success

-    post '/login', {'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", {'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

-    assert_template 'user_blocks/show'
+    assert_template "user_blocks/show"

     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", 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
     assert_response :success
   end
 end