Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days.

spec/models/category_spec.rb

@@ -211,7 +211,7 @@ describe Category do
     end
 
     it "should not set its description topic to auto-close" do
-      category = Fabricate(:category, name: 'Closing Topics', auto_close_days: 1)
+      category = Fabricate(:category, name: 'Closing Topics', auto_close_hours: 1)
       category.topic.auto_close_at.should be_nil
     end
 

spec/models/topic_spec.rb

@@ -554,7 +554,7 @@ describe Topic do
         it 'puts the autoclose duration in the moderator post' do
           @topic.created_at = 7.days.ago
           Timecop.freeze(2.days.ago) do
-            @topic.set_auto_close(2)
+            @topic.set_auto_close(48)
           end
           @topic.update_status(status, true, @user)
           expect(@topic.posts.last.raw).to include "closed after 2 days"
@@ -932,8 +932,8 @@ describe Topic do
       context 'auto_close_at is set' do
         it 'queues a job to close the topic' do
           Timecop.freeze(Time.zone.now) do
-            Jobs.expects(:enqueue_at).with(7.days.from_now, :close_topic, all_of( has_key(:topic_id), has_key(:user_id) ))
-            Fabricate(:topic, auto_close_days: 7, user: Fabricate(:admin))
+            Jobs.expects(:enqueue_at).with(7.hours.from_now, :close_topic, all_of( has_key(:topic_id), has_key(:user_id) ))
+            Fabricate(:topic, auto_close_hours: 7, user: Fabricate(:admin))
           end
         end
 
@@ -942,7 +942,7 @@ describe Topic do
           Jobs.expects(:enqueue_at).with do |datetime, job_name, job_args|
             job_args[:user_id] == topic_creator.id
           end
-          Fabricate(:topic, auto_close_days: 7, user: topic_creator)
+          Fabricate(:topic, auto_close_hours: 7, user: topic_creator)
         end
 
         it 'when auto_close_user_id is set, it will use it as the topic closer' do
@@ -951,19 +951,19 @@ describe Topic do
           Jobs.expects(:enqueue_at).with do |datetime, job_name, job_args|
             job_args[:user_id] == topic_closer.id
           end
-          Fabricate(:topic, auto_close_days: 7, auto_close_user: topic_closer, user: topic_creator)
+          Fabricate(:topic, auto_close_hours: 7, auto_close_user: topic_closer, user: topic_creator)
         end
 
         it "ignores the category's default auto-close" do
           Timecop.freeze(Time.zone.now) do
-            Jobs.expects(:enqueue_at).with(7.days.from_now, :close_topic, all_of( has_key(:topic_id), has_key(:user_id) ))
-            Fabricate(:topic, auto_close_days: 7, user: Fabricate(:admin), category_id: Fabricate(:category, auto_close_days: 2).id)
+            Jobs.expects(:enqueue_at).with(7.hours.from_now, :close_topic, all_of( has_key(:topic_id), has_key(:user_id) ))
+            Fabricate(:topic, auto_close_hours: 7, user: Fabricate(:admin), category_id: Fabricate(:category, auto_close_hours: 2).id)
           end
         end
 
         it 'sets the time when auto_close timer starts' do
           Timecop.freeze(Time.zone.now) do
-            topic = Fabricate(:topic, auto_close_days: 7, user: Fabricate(:admin))
+            topic = Fabricate(:topic, auto_close_hours: 7, user: Fabricate(:admin))
             expect(topic.auto_close_started_at).to eq(Time.zone.now)
           end
         end
@@ -1048,7 +1048,7 @@ describe Topic do
         Timecop.freeze(Time.zone.now) do
           mod = Fabricate(:moderator)
           # NOTE, only moderators can auto-close, if missing system user is used
-          topic = Fabricate(:topic, category: Fabricate(:category, auto_close_days: 14), user: mod)
+          topic = Fabricate(:topic, category: Fabricate(:category, auto_close_hours: 14), user: mod)
           Jobs.expects(:enqueue_at).with(12.hours.from_now, :close_topic, has_entries(topic_id: topic.id, user_id: topic.user_id))
           topic.auto_close_at = 12.hours.from_now
           topic.save
@@ -1067,25 +1067,25 @@ describe Topic do
     end
   end
 
-  describe "auto_close_days=" do
+  describe "auto_close_hours=" do
     subject(:topic) { Fabricate.build(:topic) }
 
     it 'can take a number' do
       Timecop.freeze(Time.zone.now) do
-        topic.auto_close_days = 2
-        topic.auto_close_at.should be_within_one_second_of(2.days.from_now)
+        topic.auto_close_hours = 2
+        topic.auto_close_at.should be_within_one_second_of(2.hours.from_now)
       end
     end
 
     it 'can take nil' do
-      topic.auto_close_days = nil
+      topic.auto_close_hours = nil
       topic.auto_close_at.should be_nil
     end
   end
 
   describe 'set_auto_close' do
     let(:topic)         { Fabricate.build(:topic) }
-    let(:closing_topic) { Fabricate.build(:topic, auto_close_days: 5) }
+    let(:closing_topic) { Fabricate.build(:topic, auto_close_hours: 5) }
     let(:admin)         { Fabricate.build(:user, id: 123) }
 
     before { Discourse.stubs(:system_user).returns(admin) }