From 31a38ea39a58d46293b6eda2306dc4ee560e9fb4 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 4 May 2017 16:39:47 -0500 Subject: [PATCH] flags: add flag cooldown test. --- app/models/post_flag.rb | 4 ++-- test/unit/post_approval_test.rb | 4 +++- test/unit/post_flag_test.rb | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/models/post_flag.rb b/app/models/post_flag.rb index a4f0ff31a..6c6643eca 100644 --- a/app/models/post_flag.rb +++ b/app/models/post_flag.rb @@ -163,8 +163,8 @@ class PostFlag < ActiveRecord::Base end def initialize_creator - self.creator_id = CurrentUser.id - self.creator_ip_addr = CurrentUser.ip_addr + self.creator_id ||= CurrentUser.id + self.creator_ip_addr ||= CurrentUser.ip_addr end def resolve! diff --git a/test/unit/post_approval_test.rb b/test/unit/post_approval_test.rb index c718feb37..dbb7343a9 100644 --- a/test/unit/post_approval_test.rb +++ b/test/unit/post_approval_test.rb @@ -49,7 +49,9 @@ class PostApprovalTest < ActiveSupport::TestCase @post.approve!(@approver2) assert_not_equal(@approver.id, @post.approver_id) CurrentUser.user = @user3 - @post.flag!("blah blah") + travel_to(PostFlag::COOLDOWN_PERIOD.from_now + 1.minute) do + @post.flag!("blah blah") + end approval = @post.approve!(@approver) assert_includes(approval.errors.full_messages, "You have previously approved this post and cannot approve it again") diff --git a/test/unit/post_flag_test.rb b/test/unit/post_flag_test.rb index 2e11ee37c..91d92d095 100644 --- a/test/unit/post_flag_test.rb +++ b/test/unit/post_flag_test.rb @@ -44,7 +44,7 @@ class PostFlagTest < ActiveSupport::TestCase @post_flag = PostFlag.create(:post => @post, :reason => "aaa", :is_resolved => false) end - assert_equal(["You have already flagged this post"], @post_flag.errors.full_messages) + assert_equal(["have already flagged this post"], @post_flag.errors[:creator_id]) end should "not be able to flag more than 10 posts in 24 hours" do @@ -64,6 +64,23 @@ class PostFlagTest < ActiveSupport::TestCase assert_equal(["Post is deleted"], @post_flag.errors.full_messages) end + should "not be able to flag a post in the cooldown period" do + users = FactoryGirl.create_list(:user, 2, created_at: 2.weeks.ago) + flag1 = FactoryGirl.create(:post_flag, post: @post, creator: users.first) + @post.approve! + + travel_to(PostFlag::COOLDOWN_PERIOD.from_now - 1.minute) do + flag2 = FactoryGirl.build(:post_flag, post: @post, creator: users.second) + assert(flag2.invalid?) + assert_match(/cannot be flagged more than once/, flag2.errors[:post].join) + end + + travel_to(PostFlag::COOLDOWN_PERIOD.from_now + 1.minute) do + flag3 = FactoryGirl.build(:post_flag, post: @post, creator: users.second) + assert(flag3.valid?) + end + end + should "initialize its creator" do @post_flag = PostFlag.create(:post => @post, :reason => "aaa", :is_resolved => false) assert_equal(@alice.id, @post_flag.creator_id)