From 8bc92811b6977b214b60ffc14b820ca1c32e2096 Mon Sep 17 00:00:00 2001 From: kikito Date: Sat, 22 Aug 2015 20:20:47 +0200 Subject: [PATCH] Adds traits to debate & comment factories --- spec/factories.rb | 20 ++++++++++++++++++++ spec/models/ability_spec.rb | 16 ++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index de12209e0..7cec55bfa 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -17,6 +17,16 @@ FactoryGirl.define do trait :hidden do hidden_at Time.now end + + trait :reviewed do + reviewed_at Time.now + end + + trait :flagged_as_inappropiate do + after :create do |debate| + InappropiateFlag.flag!(FactoryGirl.create(:user), debate) + end + end end factory :vote do @@ -33,6 +43,16 @@ FactoryGirl.define do trait :hidden do hidden_at Time.now end + + trait :reviewed do + reviewed_at Time.now + end + + trait :flagged_as_inappropiate do + after :create do |debate| + InappropiateFlag.flag!(FactoryGirl.create(:user), debate) + end + end end factory :administrator do diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index cc458857c..1ff4933b0 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -111,8 +111,8 @@ describe Ability do describe "organizations" do let(:pending_organization) { create(:organization) } - let(:rejected_organization) { create(:rejected_organization) } - let(:verified_organization) { create(:verified_organization) } + let(:rejected_organization) { create(:organization, :rejected) } + let(:verified_organization) { create(:organization, :verified) } it { should be_able_to( :verify, pending_organization) } it { should be_able_to( :reject, pending_organization) } @@ -125,12 +125,12 @@ describe Ability do end describe "hiding, reviewing and restoring" do - let(:own_comment) { create(:comment, author: user) } - let(:own_debate) { create(:debate, author: user) } - let(:hidden_comment) { create(:comment, hidden_at: Time.now) } - let(:hidden_debate) { create(:debate, hidden_at: Time.now) } - let(:reviewed_comment) { create(:comment, reviewed_at: Time.now) } - let(:reviewed_debate) { create(:debate, reviewed_at: Time.now) } + let(:own_comment) { create(:comment, author: user) } + let(:own_debate) { create(:debate, author: user) } + let(:hidden_comment) { create(:comment, :hidden) } + let(:hidden_debate) { create(:debate, :hidden) } + let(:reviewed_comment) { create(:comment, :reviewed) } + let(:reviewed_debate) { create(:debate, :reviewed) } it { should be_able_to(:hide, comment) } it { should be_able_to(:hide_in_moderation_screen, comment) }