From b507acb38bd3822fa14f4dcd7a3f7eac1d945f62 Mon Sep 17 00:00:00 2001 From: Jorge Barata Date: Mon, 7 Feb 2022 01:18:48 +0100 Subject: [PATCH] Add ballot sheet votes to the total count --- app/models/poll/ballot_sheet.rb | 2 ++ spec/models/poll/ballot_sheet_spec.rb | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/models/poll/ballot_sheet.rb b/app/models/poll/ballot_sheet.rb index 448a38955..62bf05726 100644 --- a/app/models/poll/ballot_sheet.rb +++ b/app/models/poll/ballot_sheet.rb @@ -7,6 +7,8 @@ class Poll::BallotSheet < ApplicationRecord validates :poll_id, presence: true validates :officer_assignment_id, presence: true + after_create :verify_ballots + def author officer_assignment.officer.name end diff --git a/spec/models/poll/ballot_sheet_spec.rb b/spec/models/poll/ballot_sheet_spec.rb index cfa277bfe..12a834457 100644 --- a/spec/models/poll/ballot_sheet_spec.rb +++ b/spec/models/poll/ballot_sheet_spec.rb @@ -2,9 +2,12 @@ require "rails_helper" describe Poll::BallotSheet do let(:ballot_sheet) do - build(:poll_ballot_sheet, poll: create(:poll), + budget = create(:budget) + investment1 = create(:budget_investment, budget: budget) + investment2 = create(:budget_investment, budget: budget) + build(:poll_ballot_sheet, poll: create(:poll, budget: budget), officer_assignment: create(:poll_officer_assignment), - data: "1234;5678") + data: "#{investment1.id};#{investment2.id}") end context "Validations" do @@ -36,9 +39,7 @@ describe Poll::BallotSheet do describe "#verify_ballots" do it "creates ballots for each document number" do - poll = create(:poll, :for_budget) - poll_ballot = create(:poll_ballot_sheet, poll: poll, data: "1,2,3;4,5,6") - poll_ballot.verify_ballots + create(:poll_ballot_sheet, poll: create(:poll, :for_budget), data: "1,2,3;4,5,6") expect(Poll::Ballot.count).to eq(2) expect(Budget::Ballot.count).to eq(2)