diff --git a/spec/factories/polls.rb b/spec/factories/polls.rb index 6fbe1da34..f5bcccdcb 100644 --- a/spec/factories/polls.rb +++ b/spec/factories/polls.rb @@ -30,6 +30,10 @@ FactoryBot.define do trait :published do published { true } end + + trait :hidden do + hidden_at { Time.current } + end end factory :poll_question, class: "Poll::Question" do diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb index 1f1c8275f..6847ce7c3 100644 --- a/spec/features/admin/stats_spec.rb +++ b/spec/features/admin/stats_spec.rb @@ -75,9 +75,9 @@ describe "Stats" do end scenario "Do not count hidden users" do - 1.times { create(:user, :level_three, hidden_at: Time.current) } - 2.times { create(:user, :level_two, hidden_at: Time.current) } - 3.times { create(:user, hidden_at: Time.current) } + 1.times { create(:user, :hidden, :level_three) } + 2.times { create(:user, :hidden, :level_two) } + 3.times { create(:user, :hidden) } visit admin_stats_path diff --git a/spec/lib/graphql_spec.rb b/spec/lib/graphql_spec.rb index d3a02cb54..038f73676 100644 --- a/spec/lib/graphql_spec.rb +++ b/spec/lib/graphql_spec.rb @@ -305,7 +305,7 @@ describe "Consul Schema" do it "does not include hidden comments" do visible_comment = create(:comment) - hidden_comment = create(:comment, hidden_at: Time.current) + hidden_comment = create(:comment, :hidden) response = execute("{ comments { edges { node { body } } } }") received_comments = extract_fields(response, "comments", "body") @@ -315,7 +315,7 @@ describe "Consul Schema" do it "does not include comments from hidden proposals" do visible_proposal = create(:proposal) - hidden_proposal = create(:proposal, hidden_at: Time.current) + hidden_proposal = create(:proposal, :hidden) visible_proposal_comment = create(:comment, commentable: visible_proposal) hidden_proposal_comment = create(:comment, commentable: hidden_proposal) @@ -328,7 +328,7 @@ describe "Consul Schema" do it "does not include comments from hidden debates" do visible_debate = create(:debate) - hidden_debate = create(:debate, hidden_at: Time.current) + hidden_debate = create(:debate, :hidden) visible_debate_comment = create(:comment, commentable: visible_debate) hidden_debate_comment = create(:comment, commentable: hidden_debate) @@ -341,7 +341,7 @@ describe "Consul Schema" do it "does not include comments from hidden polls" do visible_poll = create(:poll) - hidden_poll = create(:poll, hidden_at: Time.current) + hidden_poll = create(:poll, :hidden) visible_poll_comment = create(:comment, commentable: visible_poll) hidden_poll_comment = create(:comment, commentable: hidden_poll) @@ -575,7 +575,7 @@ describe "Consul Schema" do it "does not include votes of hidden proposals" do visible_proposal = create(:proposal) - hidden_proposal = create(:proposal, hidden_at: Time.current) + hidden_proposal = create(:proposal, :hidden) visible_proposal_vote = create(:vote, votable: visible_proposal) hidden_proposal_vote = create(:vote, votable: hidden_proposal) @@ -588,7 +588,7 @@ describe "Consul Schema" do it "does not include votes of hidden comments" do visible_comment = create(:comment) - hidden_comment = create(:comment, hidden_at: Time.current) + hidden_comment = create(:comment, :hidden) visible_comment_vote = create(:vote, votable: visible_comment) hidden_comment_vote = create(:vote, votable: hidden_comment) diff --git a/spec/models/budget/stats_spec.rb b/spec/models/budget/stats_spec.rb index f753ed7c6..b93514f64 100644 --- a/spec/models/budget/stats_spec.rb +++ b/spec/models/budget/stats_spec.rb @@ -7,10 +7,10 @@ describe Budget::Stats do describe "#participants" do let(:author) { investment.author } - let(:author_and_voter) { create(:user, hidden_at: Time.current) } + let(:author_and_voter) { create(:user, :hidden) } let(:voter) { create(:user) } let(:voter_and_balloter) { create(:user) } - let(:balloter) { create(:user, hidden_at: Time.current) } + let(:balloter) { create(:user, :hidden) } let(:poll_balloter) { create(:user, :level_two) } let(:non_participant) { create(:user, :level_two) } diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index fad205da3..166a92569 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -7,7 +7,7 @@ describe Poll::Stats do describe "#participants" do it "includes hidden users" do create(:poll_voter, poll: poll) - create(:poll_voter, poll: poll, user: create(:user, :level_two, hidden_at: Time.current)) + create(:poll_voter, poll: poll, user: create(:user, :level_two, :hidden)) expect(stats.participants.count).to eq(2) end