cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-08-21 19:04:06 +01:00
commit 754a0a9cb5
8 changed files with 165 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

128
test/controllers/user_blocks_controller_test.rb
View file

@ -641,6 +641,134 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_not_equal moderator_user, expired_block1.revoker
end
##
# test changes to end/deactivation dates
def test_dates_when_viewed_before_end
blocked_user = create(:user)
moderator_user = create(:moderator_user)
freeze_time do
session_for(moderator_user)
assert_difference "UserBlock.count", 1 do
post user_blocks_path(:display_name => blocked_user.display_name,
:user_block_period => "48",
:user_block => { :needs_view => true, :reason => "Testing deactivates_at" })
end
block = UserBlock.last
assert_equal Time.now.utc + 2.days, block.ends_at
assert_nil block.deactivates_at
travel 1.day
session_for(blocked_user)
get user_block_path(block)
block.reload
assert_equal Time.now.utc + 1.day, block.ends_at
assert_equal Time.now.utc + 1.day, block.deactivates_at
end
end
def test_dates_when_viewed_after_end
blocked_user = create(:user)
moderator_user = create(:moderator_user)
freeze_time do
session_for(moderator_user)
assert_difference "UserBlock.count", 1 do
post user_blocks_path(:display_name => blocked_user.display_name,
:user_block_period => "24",
:user_block => { :needs_view => true, :reason => "Testing deactivates_at" })
end
block = UserBlock.last
assert_equal Time.now.utc + 1.day, block.ends_at
assert_nil block.deactivates_at
travel 2.days
session_for(blocked_user)
get user_block_path(block)
block.reload
assert_equal Time.now.utc - 1.day, block.ends_at
assert_equal Time.now.utc, block.deactivates_at
end
end
def test_dates_when_edited_before_end
blocked_user = create(:user)
moderator_user = create(:moderator_user)
freeze_time do
session_for(moderator_user)
assert_difference "UserBlock.count", 1 do
post user_blocks_path(:display_name => blocked_user.display_name,
:user_block_period => "48",
:user_block => { :needs_view => false, :reason => "Testing deactivates_at" })
end
block = UserBlock.last
assert_equal Time.now.utc + 2.days, block.ends_at
assert_equal Time.now.utc + 2.days, block.deactivates_at
travel 1.day
put user_block_path(block,
:user_block_period => "48",
:user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" })
block.reload
assert_equal Time.now.utc + 2.days, block.ends_at
assert_equal Time.now.utc + 2.days, block.deactivates_at
end
end
def test_dates_when_edited_after_end
blocked_user = create(:user)
moderator_user = create(:moderator_user)
freeze_time do
session_for(moderator_user)
assert_difference "UserBlock.count", 1 do
post user_blocks_path(:display_name => blocked_user.display_name,
:user_block_period => "24",
:user_block => { :needs_view => false, :reason => "Testing deactivates_at" })
end
block = UserBlock.last
assert_equal Time.now.utc + 1.day, block.ends_at
assert_equal Time.now.utc + 1.day, block.deactivates_at
travel 2.days
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" })
block.reload
assert_equal Time.now.utc - 1.day, block.ends_at
assert_equal Time.now.utc - 1.day, block.deactivates_at
end
end
##
# test updates on legacy records without correctly initialized deactivates_at
def test_update_legacy_deactivates_at
blocked_user = create(:user)
moderator_user = create(:moderator_user)
freeze_time do
block = UserBlock.new :user => blocked_user,
:creator => moderator_user,
:reason => "because",
:ends_at => Time.now.utc + 1.day,
:needs_view => false
assert_difference "UserBlock.count", 1 do
block.save :validate => false
end
travel 2.days
session_for(moderator_user)
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Testing legacy block update" })
block.reload
assert_equal Time.now.utc - 1.day, block.ends_at
assert_equal Time.now.utc - 1.day, block.deactivates_at
end
end
##
# test the blocks_on action
def test_blocks_on

2
test/factories/user_blocks.rb
View file

@ -2,12 +2,14 @@ FactoryBot.define do
factory :user_block do
sequence(:reason) { |n| "User Block #{n}" }
ends_at { Time.now.utc + 1.day }
deactivates_at { ends_at }
user
creator :factory => :moderator_user
trait :needs_view do
needs_view { true }
deactivates_at { nil }
end
trait :expired do

6
test/integration/user_blocks_test.rb
View file

@ -15,7 +15,8 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
:user_id => blocked_user.id,
:creator_id => create(:moderator_user).id,
:reason => "testing",
:ends_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")
assert_response :forbidden
@ -29,7 +30,8 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
:user_id => blocked_user.id,
:creator_id => moderator.id,
:reason => "testing",
:ends_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")
assert_response :forbidden