diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index 01cece32e..e62f17b95 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -30,7 +30,7 @@ <% else %>

<%= t("admin.poll_booth_assignments.show.officers_list") %>

- +
<% @booth_assignment.officers.uniq.each do |officer| %> @@ -50,7 +50,7 @@ <% else %>

<%= t("admin.poll_booth_assignments.show.recounts_list") %>

-
+
diff --git a/spec/factories.rb b/spec/factories.rb index 9f086ab8e..ac6f76916 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -267,6 +267,10 @@ FactoryGirl.define do user end + factory :poll_officer, class: 'Poll::Officer' do + user + end + factory :poll do sequence(:name) { |n| "Poll #{n}" } @@ -307,10 +311,6 @@ FactoryGirl.define do association :booth, factory: :poll_booth end - factory :poll_officer, class: 'Poll::Officer' do - user - end - factory :poll_officer_assignment, class: 'Poll::OfficerAssignment' do association :officer, factory: :poll_officer association :booth_assignment, factory: :poll_booth_assignment diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb index c7db2b593..ff2ae833c 100644 --- a/spec/features/admin/poll/booth_assigments_spec.rb +++ b/spec/features/admin/poll/booth_assigments_spec.rb @@ -36,7 +36,7 @@ feature 'Admin booths assignments' do expect(page).to have_content booth.name end - scenario 'remove booth from poll', :js do + scenario 'Remove booth from poll', :js do poll = create(:poll) booth = create(:poll_booth) assignment = create(:poll_booth_assignment, poll: poll, booth: booth) @@ -63,4 +63,50 @@ feature 'Admin booths assignments' do expect(page).to have_content 'There are no booths assigned to this poll.' expect(page).to_not have_content booth.name end + + feature 'Show' do + scenario 'Lists all assigned poll oficers' do + poll = create(:poll) + booth = create(:poll_booth) + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment) + officer = officer_assignment.officer + + booth_assignment_2 = create(:poll_booth_assignment, poll: poll) + officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2) + officer_2 = officer_assignment_2.officer + + visit admin_poll_path(poll) + click_link 'Booths (2)' + + click_link booth.name + + click_link 'Officers' + within('#officers_list') do + expect(page).to have_content officer.name + expect(page).to_not have_content officer_2.name + end + end + + scenario 'Lists all recounts for the booth assignment' do + poll = create(:poll) + booth = create(:poll_booth) + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + recount = create(:poll_recount, booth_assignment: booth_assignment, count: 33) + + booth_assignment_2 = create(:poll_booth_assignment, poll: poll) + recount_2 = create(:poll_recount, booth_assignment: booth_assignment_2, count: 100) + + visit admin_poll_path(poll) + click_link 'Booths (2)' + + click_link booth.name + + click_link 'Recounts' + within('#recounts_list') do + expect(page).to have_content recount.count + expect(page).to_not have_content recount_2.count + end + end + end end \ No newline at end of file
<%= t("admin.poll_booth_assignments.show.date") %>