diff --git a/app/models/concerns/conflictable.rb b/app/models/concerns/conflictable.rb index c15fafa8a..faea52032 100644 --- a/app/models/concerns/conflictable.rb +++ b/app/models/concerns/conflictable.rb @@ -2,7 +2,7 @@ module Conflictable extend ActiveSupport::Concern def conflictive? - return false unless flags_count > 0 && cached_votes_up > 0 + return false unless flags_count > 0 cached_votes_up / flags_count.to_f < 5 end diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index 44fba2ec7..91761dc4f 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -452,10 +452,15 @@ describe Debate do expect(debate).not_to be_conflictive end - it "returns false when it has not votes up" do - debate.update!(cached_votes_up: 0) + it "returns false when it has no flags and no votes up" do + debate.update!(flags_count: 0, cached_votes_up: 0) expect(debate).not_to be_conflictive end + + it "returns true when it has flags and no votes up" do + debate.update!(cached_votes_up: 0, flags_count: 10) + expect(debate).to be_conflictive + end end describe "search" do