mirror of
https://github.com/discourse/discourse.git
synced 2024-12-12 02:15:49 +08:00
fb83757edb
Previously when inheriting category auto-close settings for a topic, those settings were disrupted if another topic timer was assigned or if a topic was closed then manually re-opened. This PR makes it so that when a topic is manually re-opened the topic auto-close settings are inherited from the category. However, they will now be based on the topic created_at date. As an example, for a topic with a category auto close hours setting of 72 (3 days): * Topic was created on 2021-02-15 08:00 * Topic was closed on 2021-02-16 10:00 * Topic was opened again on 2021-02-17 06:00 Now, the topic will inherit the auto close timer again and will close automatically at **2021-02-18 08:00**, which is based on the creation date. If the current date and time is greater than the original auto-close time (e.g. we were at 2021-02-20 13:45) then no auto-close timer is created. Note, this will not happen if the topic category auto-close setting is "based on last post".
91 lines
2.8 KiB
Ruby
91 lines
2.8 KiB
Ruby
# encoding: UTF-8
|
|
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Topic do
|
|
let(:job_klass) { Jobs::CloseTopic }
|
|
|
|
context 'creating a topic without auto-close' do
|
|
let(:topic) { Fabricate(:topic, category: category) }
|
|
|
|
context 'uncategorized' do
|
|
let(:category) { nil }
|
|
|
|
it 'should not schedule the topic to auto-close' do
|
|
expect(topic.public_topic_timer).to eq(nil)
|
|
expect(job_klass.jobs).to eq([])
|
|
end
|
|
end
|
|
|
|
context 'category without default auto-close' do
|
|
let(:category) { Fabricate(:category, auto_close_hours: nil) }
|
|
|
|
it 'should not schedule the topic to auto-close' do
|
|
expect(topic.public_topic_timer).to eq(nil)
|
|
expect(job_klass.jobs).to eq([])
|
|
end
|
|
end
|
|
|
|
context 'jobs may be queued' do
|
|
before do
|
|
freeze_time
|
|
end
|
|
|
|
context 'category has a default auto-close' do
|
|
let(:category) { Fabricate(:category, auto_close_hours: 2.0) }
|
|
|
|
it 'should schedule the topic to auto-close' do
|
|
topic
|
|
|
|
topic_status_update = TopicTimer.last
|
|
|
|
expect(topic_status_update.topic).to eq(topic)
|
|
expect(topic.public_topic_timer.execute_at).to be_within_one_second_of(2.hours.from_now)
|
|
end
|
|
|
|
context 'topic was created by staff user' do
|
|
let(:admin) { Fabricate(:admin) }
|
|
let(:staff_topic) { Fabricate(:topic, user: admin, category: category) }
|
|
|
|
it 'should schedule the topic to auto-close' do
|
|
staff_topic
|
|
|
|
topic_status_update = TopicTimer.last
|
|
|
|
expect(topic_status_update.topic).to eq(staff_topic)
|
|
expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
|
|
expect(topic_status_update.user).to eq(Discourse.system_user)
|
|
end
|
|
|
|
context 'topic is closed manually' do
|
|
it 'should remove the schedule to auto-close the topic' do
|
|
topic_timer_id = staff_topic.public_topic_timer.id
|
|
|
|
staff_topic.update_status('closed', true, admin)
|
|
|
|
expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
|
|
.to be_within_one_second_of(Time.zone.now)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'topic was created by a non-staff user' do
|
|
let(:regular_user) { Fabricate(:user) }
|
|
let(:regular_user_topic) { Fabricate(:topic, user: regular_user, category: category) }
|
|
|
|
it 'should schedule the topic to auto-close' do
|
|
regular_user_topic
|
|
|
|
topic_status_update = TopicTimer.last
|
|
|
|
expect(topic_status_update.topic).to eq(regular_user_topic)
|
|
expect(topic_status_update.execute_at).to be_within_one_second_of(2.hours.from_now)
|
|
expect(topic_status_update.user).to eq(Discourse.system_user)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|