<%= t("officing.dashboard.index.info") %>
- <% unless final_recount_shift? && vote_collection_shift? %> + <% if no_shifts? %>#{Faker::Lorem.paragraphs.join("
")}
" answer = Poll::Question::Answer.new(question: question, - title: title.capitalize, + title: answer_title.capitalize, description: description) I18n.available_locales.map do |locale| Globalize.with_locale(locale) do - answer.title = "#{title} (#{locale})" + answer.title = "#{answer_title} (#{locale})" answer.description = "#{description} (#{locale})" end end @@ -114,12 +114,16 @@ end section "Creating Poll Voters" do def vote_poll_on_booth(user, poll) + officer = Poll::Officer.all.sample + Poll::Voter.create!(document_type: user.document_type, document_number: user.document_number, user: user, poll: poll, origin: "booth", - officer: Poll::Officer.all.sample) + officer: officer, + officer_assignment: officer.officer_assignments.sample, + booth_assignment: poll.booth_assignments.sample) end def vote_poll_on_web(user, poll) @@ -142,11 +146,11 @@ section "Creating Poll Voters" do end (Poll.expired + Poll.current + Poll.recounting).uniq.each do |poll| - level_two_verified_users = User.level_two_verified + verified_users = User.level_two_or_three_verified if poll.geozone_restricted? - level_two_verified_users = level_two_verified_users.where(geozone_id: poll.geozone_ids) + verified_users = verified_users.where(geozone_id: poll.geozone_ids) end - user_groups = level_two_verified_users.in_groups(2) + user_groups = verified_users.in_groups(2) user_groups.first.each { |user| vote_poll_on_booth(user, poll) } user_groups.second.compact.each { |user| vote_poll_on_web(user, poll) } end @@ -158,13 +162,23 @@ section "Creating Poll Recounts" do officer_assignment = poll.officer_assignments.first author = Poll::Officer.first.user + total_amount = white_amount = null_amount = 0 + + booth_assignment.voters.count.times do + case rand + when 0...0.1 then null_amount += 1 + when 0.1...0.2 then white_amount += 1 + else total_amount += 1 + end + end + Poll::Recount.create!(officer_assignment: officer_assignment, booth_assignment: booth_assignment, author: author, date: poll.ends_at, - white_amount: rand(0..10), - null_amount: rand(0..10), - total_amount: rand(100..9999), + white_amount: white_amount, + null_amount: null_amount, + total_amount: total_amount, origin: "booth") end end diff --git a/db/dev_seeds/users.rb b/db/dev_seeds/users.rb index 199b16dfb..95330b645 100644 --- a/db/dev_seeds/users.rb +++ b/db/dev_seeds/users.rb @@ -8,7 +8,7 @@ section "Creating Users" do password_confirmation: password, confirmed_at: Time.current, terms_of_service: "1", - gender: ["Male", "Female"].sample, + gender: %w[male female].sample, date_of_birth: rand((Time.current - 80.years)..(Time.current - 16.years)), public_activity: (rand(1..100) > 30) ) diff --git a/spec/features/budget_polls/officing_spec.rb b/spec/features/budget_polls/officing_spec.rb index 7f77b5caa..7b91eec12 100644 --- a/spec/features/budget_polls/officing_spec.rb +++ b/spec/features/budget_polls/officing_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" feature "Budget Poll Officing" do - scenario "Show sidebar menu if officer has shifts assigned" do + scenario "Show sidebar menus if officer has shifts assigned" do poll = create(:poll) booth = create(:poll_booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) @@ -10,13 +10,21 @@ feature "Budget Poll Officing" do user = create(:user) officer = create(:poll_officer, user: user) + create(:poll_shift, officer: officer, booth: booth, date: Date.current, task: :vote_collection) + + login_as user + visit officing_root_path + + expect(page).not_to have_content("You don't have officing shifts today") + expect(page).to have_content("Validate document") + expect(page).not_to have_content("Total recounts and results") + create(:poll_shift, officer: officer, booth: booth, date: Date.current, task: :recount_scrutiny) officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer) - login_as user visit officing_root_path expect(page).not_to have_content("You don't have officing shifts today") @@ -24,7 +32,7 @@ feature "Budget Poll Officing" do expect(page).to have_content("Total recounts and results") end - scenario "Do not show sidebar menu if officer has no shifts assigned" do + scenario "Do not show sidebar menus if officer has no shifts assigned" do user = create(:user) officer = create(:poll_officer, user: user) diff --git a/spec/features/officing/booth_spec.rb b/spec/features/officing/booth_spec.rb new file mode 100644 index 000000000..72eddbdbc --- /dev/null +++ b/spec/features/officing/booth_spec.rb @@ -0,0 +1,87 @@ +require "rails_helper" + +feature "Booth", :with_frozen_time do + + scenario "Officer with no booth assignments today" do + officer = create(:poll_officer) + + login_through_form_as_officer(officer.user) + + expect(page).to have_content "You don't have officing shifts today" + end + + scenario "Officer with booth assignments another day" do + officer = create(:poll_officer) + create(:poll_officer_assignment, officer: officer, date: Date.current + 1.day) + + login_through_form_as_officer(officer.user) + + expect(page).to have_content "You don't have officing shifts today" + end + + scenario "Officer with single booth assignment today" do + officer = create(:poll_officer) + poll = create(:poll) + + booth = create(:poll_booth) + + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + create(:poll_officer_assignment, officer: officer, booth_assignment: booth_assignment, date: Date.current) + + login_through_form_as_officer(officer.user) + + within("#officing-booth") do + expect(page).to have_content "You are officing the booth located at #{booth.location}." + end + end + + scenario "Officer with multiple booth assignments today" do + officer = create(:poll_officer) + poll = create(:poll) + + booth1 = create(:poll_booth) + booth2 = create(:poll_booth) + + ba1 = create(:poll_booth_assignment, poll: poll, booth: booth1) + ba2 = create(:poll_booth_assignment, poll: poll, booth: booth2) + + create(:poll_officer_assignment, officer: officer, booth_assignment: ba1, date: Date.current) + create(:poll_officer_assignment, officer: officer, booth_assignment: ba2, date: Date.current) + + login_through_form_as_officer(officer.user) + + expect(page).to have_content "Choose your booth" + + select booth2.location, from: "booth_id" + click_button "Enter" + + within("#officing-booth") do + expect(page).to have_content "You are officing the booth located at #{booth2.location}." + end + end + + scenario "Display single booth for any number of polls" do + officer = create(:poll_officer) + + booth1 = create(:poll_booth) + booth2 = create(:poll_booth) + + poll1 = create(:poll) + poll2 = create(:poll) + + ba1 = create(:poll_booth_assignment, poll: poll1, booth: booth1) + ba2 = create(:poll_booth_assignment, poll: poll2, booth: booth2) + ba3 = create(:poll_booth_assignment, poll: poll2, booth: booth2) + + create(:poll_officer_assignment, officer: officer, booth_assignment: ba1, date: Date.current) + create(:poll_officer_assignment, officer: officer, booth_assignment: ba2, date: Date.current) + create(:poll_officer_assignment, officer: officer, booth_assignment: ba3, date: Date.current) + + login_through_form_as_officer(officer.user) + + expect(page).to have_content "Choose your booth" + + expect(page).to have_select("booth_id", options: [booth1.location, booth2.location]) + end + +end diff --git a/spec/features/officing/residence_spec.rb b/spec/features/officing/residence_spec.rb index 9f07eb8ce..3908fa546 100644 --- a/spec/features/officing/residence_spec.rb +++ b/spec/features/officing/residence_spec.rb @@ -25,7 +25,7 @@ feature "Residence", :with_frozen_time do background do create(:poll_officer_assignment, officer: officer) - login_as(officer.user) + login_through_form_as_officer(officer.user) visit officing_root_path end @@ -93,4 +93,27 @@ feature "Residence", :with_frozen_time do end + scenario "Verify booth", :js do + booth = create(:poll_booth) + poll = create(:poll) + + ba = create(:poll_booth_assignment, poll: poll, booth: booth) + create(:poll_officer_assignment, officer: officer, booth_assignment: ba) + create(:poll_shift, officer: officer, booth: booth, date: Date.current) + + login_as(officer.user) + + visit new_officing_residence_path + within("#officing-booth") do + expect(page).to have_content "You are officing the booth located at #{booth.location}." + end + + officing_verify_residence + + expect(page).to have_content poll.name + click_button "Confirm vote" + + expect(page).to have_content "Vote introduced!" + end + end diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index 56a0aa4d8..54d674220 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -5,6 +5,7 @@ feature "Officing Results", :with_frozen_time do background do @poll_officer = create(:poll_officer) @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer) + create(:poll_shift, officer: @poll_officer, booth: @officer_assignment.booth, date: Date.current) @poll = @officer_assignment.booth_assignment.poll @poll.update(ends_at: 1.day.ago) @question_1 = create(:poll_question, poll: @poll) @@ -15,6 +16,7 @@ feature "Officing Results", :with_frozen_time do create(:poll_question_answer, title: "Tomorrow", question: @question_2) login_as(@poll_officer.user) + set_officing_booth(@officer_assignment.booth) end scenario "Only polls where user is officer for results are accessible" do @@ -30,6 +32,7 @@ feature "Officing Results", :with_frozen_time do click_link "Polling officers" expect(page).to have_content("Poll officing") + within("#side_menu") do click_link "Total recounts and results" end diff --git a/spec/features/officing/voters_spec.rb b/spec/features/officing/voters_spec.rb index 067520d27..2f21234e7 100644 --- a/spec/features/officing/voters_spec.rb +++ b/spec/features/officing/voters_spec.rb @@ -12,9 +12,12 @@ feature "Voters" do create(:poll_shift, officer: officer, booth: booth, date: Date.current, task: :vote_collection) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) create(:poll_officer_assignment, officer: officer, booth_assignment: booth_assignment) + set_officing_booth(booth) end scenario "Can vote", :js do + create(:poll_officer_assignment, officer: officer) + visit new_officing_residence_path officing_verify_residence @@ -57,6 +60,10 @@ feature "Voters" do user = create(:user, residence_verified_at: Time.current, document_type: "1", document_number: "12345678Z") expect(user).not_to be_level_two_verified + visit root_path + click_link "Sign out" + login_through_form_as_officer(officer.user) + visit new_officing_residence_path officing_verify_residence @@ -83,6 +90,7 @@ feature "Voters" do booth_assignment = create(:poll_booth_assignment, poll: poll_geozone_restricted_out, booth: booth) create(:poll_officer_assignment, officer: officer, booth_assignment: booth_assignment) + set_officing_booth(second_booth) visit new_officing_residence_path officing_verify_residence @@ -93,4 +101,44 @@ feature "Voters" do expect(page).to have_content poll_geozone_restricted_in.name expect(page).not_to have_content poll_geozone_restricted_out.name end + + scenario "Store officer and booth information", :js do + create(:user, :in_census, id: rand(9999999)) + poll1 = create(:poll, name: "¿Quieres que XYZ sea aprobado?") + poll2 = create(:poll, name: "Pregunta de votación de prueba") + + second_booth = create(:poll_booth) + + ba1 = create(:poll_booth_assignment, poll: poll1, booth: second_booth ) + ba2 = create(:poll_booth_assignment, poll: poll2, booth: second_booth ) + create(:poll_shift, officer: officer, booth: second_booth, date: Date.current, task: :vote_collection) + + validate_officer + visit new_officing_residence_path + set_officing_booth(second_booth) + officing_verify_residence + + within("#poll_#{poll1.id}") do + click_button "Confirm vote" + + expect(page).to have_content "Vote introduced!" + end + + within("#poll_#{poll2.id}") do + click_button "Confirm vote" + + expect(page).to have_content "Vote introduced!" + end + + expect(Poll::Voter.count).to eq(2) + + voter1 = Poll::Voter.first + + expect(voter1.booth_assignment).to eq(ba1) + expect(voter1.officer_assignment).to eq(ba1.officer_assignments.first) + + voter2 = Poll::Voter.last + expect(voter2.booth_assignment).to eq(ba2) + expect(voter2.officer_assignment).to eq(ba2.officer_assignments.first) + end end diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 0d865b13f..fe03d5eef 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -97,6 +97,7 @@ feature "Poll Officing" do end scenario "Poll officer access links" do + create(:poll) create(:poll_officer, user: user) login_as(user) visit root_path diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index 8e0271f8f..9310c2438 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -8,6 +8,7 @@ feature "Voter" do let(:question) { create(:poll_question, poll: poll) } let(:booth) { create(:poll_booth) } let(:officer) { create(:poll_officer) } + let(:admin) { create(:administrator) } let!(:answer_yes) { create(:poll_question_answer, question: question, title: "Yes") } let!(:answer_no) { create(:poll_question_answer, question: question, title: "No") } @@ -71,6 +72,56 @@ feature "Voter" do expect(Poll::Voter.count).to eq(1) expect(Poll::Voter.first.origin).to eq("booth") + + visit root_path + click_link "Sign out" + login_as(admin.user) + visit admin_poll_recounts_path(poll) + + within("#total_system") do + expect(page).to have_content "1" + end + + within("#poll_booth_assignment_#{Poll::BoothAssignment.where(poll: poll, booth: booth).first.id}_recounts") do + expect(page).to have_content "1" + end + end + + context "The person has decided not to vote at this time" do + let!(:user) { create(:user, :in_census) } + + scenario "Show not to vote at this time button" do + login_through_form_as_officer(officer.user) + + visit new_officing_residence_path + officing_verify_residence + + expect(page).to have_content poll.name + expect(page).to have_button "Confirm vote" + expect(page).to have_content "Can vote" + expect(page).to have_link "The person has decided not to vote at this time" + end + + scenario "Hides not to vote at this time button if already voted", :js do + login_through_form_as_officer(officer.user) + + visit new_officing_residence_path + officing_verify_residence + + within("#poll_#{poll.id}") do + click_button("Confirm vote") + expect(page).not_to have_button("Confirm vote") + expect(page).to have_content "Vote introduced!" + expect(page).not_to have_content "The person has decided not to vote at this time" + end + + visit new_officing_residence_path + officing_verify_residence + + expect(page).to have_content "Has already participated in this poll" + expect(page).not_to have_content "The person has decided not to vote at this time" + end + end context "Trying to vote the same poll in booth and web" do @@ -107,6 +158,19 @@ feature "Voter" do expect(page).not_to have_link(answer_yes.title) expect(page).to have_content "You have already participated in a physical booth. You can not participate again." expect(Poll::Voter.count).to eq(1) + + visit root_path + click_link "Sign out" + login_as(admin.user) + visit admin_poll_recounts_path(poll) + + within("#total_system") do + expect(page).to have_content "1" + end + + within("#poll_booth_assignment_#{Poll::BoothAssignment.where(poll: poll, booth: booth).first.id}_recounts") do + expect(page).to have_content "1" + end end scenario "Trying to vote in web again", :js do @@ -162,6 +226,19 @@ feature "Voter" do expect(page).not_to have_link(answer_yes.title) expect(page).to have_content "You have already participated in a physical booth. You can not participate again." expect(Poll::Voter.count).to eq(1) + + visit root_path + click_link "Sign out" + login_as(admin.user) + visit admin_poll_recounts_path(poll) + + within("#total_system") do + expect(page).to have_content "1" + end + + within("#poll_booth_assignment_#{Poll::BoothAssignment.where(poll: poll, booth: booth).first.id}_recounts") do + expect(page).to have_content "1" + end end context "Side menu" do diff --git a/spec/models/poll/officer_spec.rb b/spec/models/poll/officer_spec.rb index 1cbad6f5d..4cdc581b1 100644 --- a/spec/models/poll/officer_spec.rb +++ b/spec/models/poll/officer_spec.rb @@ -121,4 +121,21 @@ describe Poll::Officer do expect(assigned_polls.last).to eq(poll_3) end end + + describe "todays_booths" do + let(:officer) { create(:poll_officer) } + + it "returns booths for the application's time zone date", :with_different_time_zone do + assignment_with_local_time_zone = create(:poll_officer_assignment, + date: Date.today, + officer: officer) + + assignment_with_application_time_zone = create(:poll_officer_assignment, + date: Date.current, + officer: officer) + + expect(officer.todays_booths).to include(assignment_with_application_time_zone.booth) + expect(officer.todays_booths).not_to include(assignment_with_local_time_zone.booth) + end + end end diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb index 85c72aa7d..3ebab9818 100644 --- a/spec/models/poll/voter_spec.rb +++ b/spec/models/poll/voter_spec.rb @@ -6,6 +6,7 @@ describe Poll::Voter do let(:booth) { create(:poll_booth) } let(:booth_assignment) { create(:poll_booth_assignment, poll: poll, booth: booth) } let(:voter) { create(:poll_voter) } + let(:officer_assignment) { create(:poll_officer_assignment) } describe "validations" do @@ -97,6 +98,7 @@ describe Poll::Voter do it "is valid with a booth origin" do voter.origin = "booth" + voter.officer_assignment = officer_assignment expect(voter).to be_valid end @@ -104,7 +106,27 @@ describe Poll::Voter do voter.origin = "web" expect(voter).to be_valid end + end + context "assignments" do + it "should not be valid without a booth_assignment_id when origin is booth" do + voter.origin = "booth" + voter.booth_assignment_id = nil + expect(voter).not_to be_valid + end + + it "should not be valid without an officer_assignment_id when origin is booth" do + voter.origin = "booth" + voter.officer_assignment_id = nil + expect(voter).not_to be_valid + end + + it "should be valid without assignments when origin is web" do + voter.origin = "web" + voter.booth_assignment_id = nil + voter.officer_assignment_id = nil + expect(voter).to be_valid + end end end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 4972d215e..118508119 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -21,4 +21,15 @@ module CommonActions check "user_terms_of_service" end + def validate_officer + allow_any_instance_of(Officing::BaseController). + to receive(:verify_officer_assignment).and_return(true) + end + + def set_officing_booth(booth=nil) + booth = create(:poll_booth) if booth.blank? + + allow_any_instance_of(Officing::BaseController). + to receive(:current_booth).and_return(booth) + end end