removes daily recounts from officers doing final recounts

This commit is contained in:
Juanjo Bazán
2017-01-31 11:37:19 +01:00
parent abf40812b1
commit 09a9761c87
2 changed files with 5 additions and 19 deletions

View File

@@ -52,7 +52,6 @@
<th><%= t("officing.final_recounts.new.date") %></th>
<th><%= t("officing.final_recounts.new.booth") %></th>
<th><%= t("officing.final_recounts.new.count") %></th>
<th><%= "Recuento diario anterior" %></th>
<th><%= "Recuento del sistema" %></th>
</thead>
<tbody>
@@ -67,9 +66,6 @@
<td>
<strong><%= final_recount.count %></strong>
</td>
<td>
<strong><%= recount_to_compare_with_final_recount final_recount %></strong>
</td>
<td>
<strong><%= system_recount_to_compare_with_final_recount final_recount %></strong>
</td>

View File

@@ -98,34 +98,24 @@ feature 'Officing Final Recount' do
expect(page).to_not have_content('100')
end
scenario 'Show daily, final and system recounts to compare' do
voting_officer_assignment = create(:poll_officer_assignment, date: 7.days.ago)
poll = voting_officer_assignment.booth_assignment.poll
scenario 'Show final and system recounts to compare' do
final_officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer)
poll = final_officer_assignment.booth_assignment.poll
poll.update(ends_at: 1.day.ago)
daily_recount = create(:poll_recount,
officer_assignment: voting_officer_assignment,
booth_assignment: voting_officer_assignment.booth_assignment,
date: voting_officer_assignment.date,
count: 500)
final_officer_assignment = create(:poll_officer_assignment, :final,
booth_assignment: voting_officer_assignment.booth_assignment,
date: poll.ends_at + 1.day,
officer: @poll_officer)
final_recount = create(:poll_final_recount,
officer_assignment: final_officer_assignment,
booth_assignment: final_officer_assignment.booth_assignment,
date: daily_recount.date,
date: 7.days.ago,
count: 100)
33.times { create(:poll_voter, :valid_document,
poll: poll,
booth_assignment: final_officer_assignment.booth_assignment,
created_at: daily_recount.date) }
created_at: final_recount.date) }
visit new_officing_poll_final_recount_path(poll)
within("#poll_final_recount_#{final_recount.id}") do
expect(page).to have_content(I18n.l(final_recount.date.to_date, format: :long))
expect(page).to have_content(final_officer_assignment.booth_assignment.booth.name)
expect(page).to have_content('500')
expect(page).to have_content('100')
expect(page).to have_content('33')
end