Fixes #3590 - Allow out of office for one day without setting two days

This commit is contained in:
Mantas 2021-08-02 16:38:11 +03:00 committed by Thorsten Eckel
parent d8f16b68ef
commit 32be22113a
2 changed files with 84 additions and 1 deletions

View file

@ -195,7 +195,12 @@ returns
return false if out_of_office_start_at.blank? return false if out_of_office_start_at.blank?
return false if out_of_office_end_at.blank? return false if out_of_office_end_at.blank?
Time.zone.today.between?(out_of_office_start_at, out_of_office_end_at) Time.use_zone(Setting.get('timezone_default').presence) do
start = out_of_office_start_at.beginning_of_day
finish = out_of_office_end_at.end_of_day
Time.zone.now.between? start, finish
end
end end
=begin =begin

View file

@ -264,6 +264,84 @@ RSpec.describe User, type: :model do
end end
end end
end end
context 'date range is inclusive' do
before do
freeze_time
agent.update(
out_of_office: true,
out_of_office_start_at: 1.day.from_now.to_date,
out_of_office_end_at: 1.week.from_now.to_date,
out_of_office_replacement_id: 1
)
end
it 'today in office' do
expect(agent).not_to be_out_of_office
end
it 'tomorrow not in office' do
travel 1.day
expect(agent).to be_out_of_office
end
it 'after 7 days not in office' do
travel 7.days
expect(agent).to be_out_of_office
end
it 'after 8 days in office' do
travel 8.days
expect(agent).not_to be_out_of_office
end
end
# https://github.com/zammad/zammad/issues/3590
context 'when setting the same date' do
before do
freeze_time
target_date = 1.day.from_now.to_date
agent.update(
out_of_office: true,
out_of_office_start_at: target_date,
out_of_office_end_at: target_date,
out_of_office_replacement_id: 1
)
end
it 'agent is out of office tomorrow' do
travel 1.day
expect(agent).to be_out_of_office
end
it 'agent is not out of office the day after tomorrow' do
travel 2.days
expect(agent).not_to be_out_of_office
end
it 'agent is not out of office today' do
expect(agent).not_to be_out_of_office
end
context 'given it respects system time zone' do
before do
travel_to Time.current.end_of_day
end
it 'agent is in office if in UTC' do
expect(agent).not_to be_out_of_office
end
it 'agent is out of office if ahead of UTC' do
travel_to Time.current.end_of_day
Setting.set('timezone_default', 'Europe/Vilnius')
expect(agent).to be_out_of_office
end
end
end
end end
describe '#out_of_office_agent' do describe '#out_of_office_agent' do