consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap Poll White/Null/Total usage for Poll Recount

Browse Source
This commit is contained in:
Bertocq
2017-10-02 15:21:50 +02:00
parent 6c297ae789
commit b5cf28cb35
13 changed files with 43 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/features/admin/poll/polls_spec.rb
View File

@@ -249,18 +249,18 @@ feature 'Admin polls' do
booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll)
3.times do |i|
create(:poll_total_result,
create(:poll_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
amount: 21)
total_amount: 21)
end
2.times { create(:poll_voter, booth_assignment: booth_assignment_final_recounted) }
create(:poll_total_result,
create(:poll_recount,
booth_assignment: booth_assignment_final_recounted,
date: poll.ends_at,
amount: 55555)
total_amount: 55555)
visit admin_poll_path(poll)
@@ -318,12 +318,10 @@ feature 'Admin polls' do
answer: 'Tomorrow',
amount: 5)
end
create(:poll_white_result,
create(:poll_recount,
booth_assignment: booth_assignment_1,
amount: 21)
create(:poll_null_result,
booth_assignment: booth_assignment_3,
amount: 44)
white_amount: 21,
null_amount: 44)
visit admin_poll_path(poll)

16
spec/features/officing/results_spec.rb
View File

@@ -127,21 +127,13 @@ feature 'Officing Results' do
date: @poll.ends_at,
question: @question_1,
amount: 33)
white_result = create(:poll_white_result,
poll_recount = create(:poll_recount,
officer_assignment: @officer_assignment,
booth_assignment: @officer_assignment.booth_assignment,
date: @poll.ends_at,
amount: 21)
null_result = create(:poll_null_result,
officer_assignment: @officer_assignment,
booth_assignment: @officer_assignment.booth_assignment,
date: @poll.ends_at,
amount: 44)
total_result = create(:poll_total_result,
officer_assignment: @officer_assignment,
booth_assignment: @officer_assignment.booth_assignment,
date: @poll.ends_at,
amount: 66)
white_amount: 21,
null_amount: 44,
total_amount: 66)
visit officing_poll_results_path(@poll,
date: I18n.l(@poll.ends_at.to_date),