Merge branch 'master' into polls_minor_changes

spec/factories.rb

@@ -52,6 +52,12 @@ FactoryGirl.define do
     trait :verified do
       verified_at Time.current
     end
+
+    trait :in_census do
+      document_number "12345678Z"
+      document_type "1"
+      verified_at Time.current
+    end
   end
 
   factory :identity do
@@ -525,6 +531,7 @@ FactoryGirl.define do
   factory :poll_voter, class: 'Poll::Voter' do
     poll
     association :user, :level_two
+    origin "web"
 
     trait :from_booth do
       association :booth_assignment, factory: :poll_booth_assignment

spec/features/admin/poll/shifts_spec.rb

@@ -30,13 +30,13 @@ feature 'Admin shifts' do
     expect(page).to have_content officer.name
   end
 
-  scenario "Create Vote Collection Shift", :js do
+  scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do
     poll = create(:poll, :current)
-    vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) }
-
     booth = create(:poll_booth)
     assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
     officer = create(:poll_officer)
+    vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) }
+    recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) }
 
     visit available_admin_booths_path
 
@@ -61,15 +61,6 @@ feature 'Admin shifts' do
       expect(page).to have_content("Collect Votes")
       expect(page).to have_content(officer.name)
     end
-  end
-
-  scenario "Create Recount & Scrutiny Shift", :js do
-    poll = create(:poll, :current)
-    recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) }
-
-    booth = create(:poll_booth)
-    assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
-    officer = create(:poll_officer)
 
     visit available_admin_booths_path
 
@@ -91,7 +82,7 @@ feature 'Admin shifts' do
     expect(page).to have_content "Shift added"
 
     within("#shifts") do
-      expect(page).to have_css(".shift", count: 1)
+      expect(page).to have_css(".shift", count: 2)
       expect(page).to have_content(I18n.l(poll.ends_at.to_date + 4.days, format: :long))
       expect(page).to have_content("Recount & Scrutiny")
       expect(page).to have_content(officer.name)

spec/features/home_spec.rb

@@ -22,11 +22,6 @@ feature "Home" do
 
   feature "For signed in users" do
 
-    before do
-      # user = create(:user)
-      # login_as(user)
-    end
-
     feature "Recommended" do
 
       background do

spec/features/polls/polls_spec.rb

@@ -184,6 +184,7 @@ feature 'Polls' do
       poll.geozones << geozone
       create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
       user = create(:user, :level_two, geozone: geozone)
+
       login_as user
       visit poll_path(poll)
 
@@ -193,5 +194,25 @@ feature 'Polls' do
       expect(page).to have_link('Chewbacca')
     end
 
+    scenario 'Level 2 users changing answer', :js do
+      poll.update(geozone_restricted: true)
+      poll.geozones << geozone
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      user = create(:user, :level_two, geozone: geozone)
+
+      login_as user
+      visit poll_path(poll)
+
+      click_link 'Han Solo'
+
+      expect(page).to_not have_link('Han Solo')
+      expect(page).to have_link('Chewbacca')
+
+      click_link 'Chewbacca'
+
+      expect(page).to_not have_link('Chewbacca')
+      expect(page).to have_link('Han Solo')
+    end
+
   end
 end

spec/features/polls/voter_spec.rb

@@ -0,0 +1,94 @@
+require 'rails_helper'
+
+feature "Voter" do
+
+  context "Origin" do
+
+    scenario "Voting via web", :js do
+      poll = create(:poll)
+      question = create(:poll_question, poll: poll, valid_answers: 'Yes, No')
+      user = create(:user, :level_two)
+
+      login_as user
+      visit question_path(question)
+
+      click_link 'Answer this question'
+      click_link 'Yes'
+
+      expect(page).to_not have_link('Yes')
+      expect(Poll::Voter.count).to eq(1)
+      expect(Poll::Voter.first.origin).to eq("web")
+    end
+
+    scenario "Voting in booth", :js do
+      user  = create(:user, :in_census)
+      create(:geozone, :in_census)
+
+      poll = create(:poll)
+      officer = create(:poll_officer)
+
+      ba = create(:poll_booth_assignment, poll: poll)
+      create(:poll_officer_assignment, officer: officer, booth_assignment: ba)
+
+      login_through_form_as_officer(officer.user)
+
+      visit new_officing_residence_path
+      officing_verify_residence
+
+      expect(page).to have_content poll.name
+
+      first(:button, "Confirm vote").click
+      expect(page).to have_content "Vote introduced!"
+
+      expect(Poll::Voter.count).to eq(1)
+      expect(Poll::Voter.first.origin).to eq("booth")
+    end
+
+    context "Trying to vote the same poll in booth and web" do
+
+      let(:poll) { create(:poll) }
+      let(:question) { create(:poll_question, poll: poll, valid_answers: 'Yes, No') }
+      let!(:user) { create(:user, :in_census) }
+
+      let(:officer) { create(:poll_officer) }
+      let(:ba) { create(:poll_booth_assignment, poll: poll) }
+      let!(:oa) { create(:poll_officer_assignment, officer: officer, booth_assignment: ba) }
+
+      scenario "Trying to vote in web and then in booth", :js do
+        login_as user
+        vote_for_poll_via_web
+
+        click_link "Sign out"
+
+        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_not have_button "Confirm vote"
+        expect(page).to have_content "Has already participated in this poll"
+      end
+
+      scenario "Trying to vote in booth and then in web", :js do
+        login_through_form_as_officer(officer.user)
+
+        vote_for_poll_via_booth
+
+        visit root_path
+        click_link "Sign out"
+
+        login_as user
+        visit question_path(question)
+
+        click_link 'Answer this question'
+
+        expect(page).to_not have_link('Yes')
+        expect(page).to have_content "You have already participated in a booth for this poll."
+        expect(Poll::Voter.count).to eq(1)
+      end
+    end
+
+  end
+
+end

spec/models/abilities/administrator_spec.rb

@@ -72,6 +72,7 @@ describe "Abilities::Administrator" do
 
   it { should be_able_to(:create, Budget) }
   it { should be_able_to(:update, Budget) }
+  it { should be_able_to(:read_results, Budget) }
 
   it { should be_able_to(:create, Budget::ValuatorAssignment) }
 

spec/models/abilities/everyone_spec.rb

@@ -8,6 +8,9 @@ describe "Abilities::Everyone" do
   let(:debate) { create(:debate) }
   let(:proposal) { create(:proposal) }
 
+  let(:reviewing_ballot_budget) { create(:budget, phase: 'reviewing_ballots') }
+  let(:finished_budget) { create(:budget, phase: 'finished') }
+
   it { should be_able_to(:index, Debate) }
   it { should be_able_to(:show, debate) }
   it { should_not be_able_to(:edit, Debate) }
@@ -28,4 +31,7 @@ describe "Abilities::Everyone" do
   it { should_not be_able_to(:create, SpendingProposal) }
 
   it { should be_able_to(:index, Budget) }
-end
+
+  it { should be_able_to(:read_results, finished_budget) }
+  it { should_not be_able_to(:read_results, reviewing_ballot_budget) }
+end

spec/models/poll/answer_spec.rb

@@ -3,28 +3,71 @@ require 'rails_helper'
 describe Poll::Answer do
 
   describe "validations" do
-    it "validates that the answers are included in the Poll::Question's list" do
-      q = create(:poll_question, valid_answers: 'One, Two, Three')
-      expect(build(:poll_answer, question: q, answer: 'One')).to be_valid
-      expect(build(:poll_answer, question: q, answer: 'Two')).to be_valid
-      expect(build(:poll_answer, question: q, answer: 'Three')).to be_valid
 
-      expect(build(:poll_answer, question: q, answer: 'Four')).to_not be_valid
+    let(:answer) { build(:poll_answer) }
+
+    it "should be valid" do
+      expect(answer).to be_valid
+    end
+
+    it "should not be valid wihout a question" do
+      answer.question = nil
+      expect(answer).to_not be_valid
+    end
+
+    it "should not be valid without an author" do
+      answer.author = nil
+      expect(answer).to_not be_valid
+    end
+
+    it "should not be valid without an answer" do
+      answer.answer = nil
+      expect(answer).to_not be_valid
+    end
+
+    it "should be valid for answers included in the Poll::Question's list" do
+      question = create(:poll_question, valid_answers: 'One, Two, Three')
+      expect(build(:poll_answer, question: question, answer: 'One')).to be_valid
+      expect(build(:poll_answer, question: question, answer: 'Two')).to be_valid
+      expect(build(:poll_answer, question: question, answer: 'Three')).to be_valid
+
+      expect(build(:poll_answer, question: question, answer: 'Four')).to_not be_valid
     end
   end
 
   describe "#record_voter_participation" do
+
+    let(:author) { create(:user, :level_two) }
+    let(:poll) { create(:poll) }
+    let(:question) { create(:poll_question, poll: poll, valid_answers: "Yes, No") }
+
     it "creates a poll_voter with user and poll data" do
-      answer = create(:poll_answer)
+      answer = create(:poll_answer, question: question, author: author, answer: "Yes")
       expect(answer.poll.voters).to be_blank
 
       answer.record_voter_participation
-      expect(answer.poll.reload.voters.size).to eq(1)
-      voter = answer.poll.voters.first
+      expect(poll.reload.voters.size).to eq(1)
+      voter = poll.voters.first
 
       expect(voter.document_number).to eq(answer.author.document_number)
       expect(voter.poll_id).to eq(answer.poll.id)
     end
+
+    it "updates a poll_voter with user and poll data" do
+      answer = create(:poll_answer, question: question, author: author, answer: "Yes")
+      answer.record_voter_participation
+
+      expect(poll.reload.voters.size).to eq(1)
+
+      answer = create(:poll_answer, question: question, author: author, answer: "No")
+      answer.record_voter_participation
+
+      expect(poll.reload.voters.size).to eq(1)
+
+      voter = poll.voters.first
+      expect(voter.document_number).to eq(answer.author.document_number)
+      expect(voter.poll_id).to eq(answer.poll.id)
+    end
   end
 
 end

spec/models/poll/poll_spec.rb

@@ -138,4 +138,33 @@ describe :poll do
       end
     end
   end
+
+  describe "#voted_in_booth?" do
+
+    it "returns true if the user has already voted in booth" do
+      user = create(:user, :level_two)
+      poll = create(:poll)
+
+      create(:poll_voter, poll: poll, user: user, origin: "booth")
+
+      expect(poll.voted_in_booth?(user)).to be
+    end
+
+    it "returns false if the user has not already voted in a booth" do
+      user = create(:user, :level_two)
+      poll = create(:poll)
+
+      expect(poll.voted_in_booth?(user)).to_not be
+    end
+
+    it "returns false if the user has voted in web" do
+      user = create(:user, :level_two)
+      poll = create(:poll)
+
+      create(:poll_voter, poll: poll, user: user, origin: "web")
+
+      expect(poll.voted_in_booth?(user)).to_not be
+    end
+
+  end
 end

spec/models/poll/recount_spec.rb

@@ -3,7 +3,9 @@ require 'rails_helper'
 describe Poll::Recount do
 
   describe "logging changes" do
-    let(:poll_recount) { create(:poll_recount) }
+    let(:author) { create(:user) }
+    let(:officer_assignment) { create(:poll_officer_assignment) }
+    let(:poll_recount) { create(:poll_recount, author: author, officer_assignment: officer_assignment) }
 
     it "should update white_amount_log if white_amount changes" do
       poll_recount.white_amount = 33
@@ -17,7 +19,7 @@ describe Poll::Recount do
       poll_recount.white_amount = 34
       poll_recount.save
 
-      expect(poll_recount.white_amount_log).to eq(":33:32")
+      expect(poll_recount.white_amount_log).to eq(":0:33:32")
     end
 
     it "should update null_amount_log if null_amount changes" do
@@ -32,7 +34,7 @@ describe Poll::Recount do
       poll_recount.null_amount = 34
       poll_recount.save
 
-      expect(poll_recount.null_amount_log).to eq(":33:32")
+      expect(poll_recount.null_amount_log).to eq(":0:33:32")
     end
 
     it "should update total_amount_log if total_amount changes" do
@@ -47,7 +49,7 @@ describe Poll::Recount do
       poll_recount.total_amount = 34
       poll_recount.save
 
-      expect(poll_recount.total_amount_log).to eq(":33:32")
+      expect(poll_recount.total_amount_log).to eq(":0:33:32")
     end
 
     it "should update officer_assignment_id_log if amount changes" do
@@ -68,8 +70,8 @@ describe Poll::Recount do
       poll_recount.officer_assignment = create(:poll_officer_assignment, id: 103)
       poll_recount.save
 
-      expect(poll_recount.white_amount_log).to eq(":33:32")
-      expect(poll_recount.officer_assignment_id_log).to eq(":101:102")
+      expect(poll_recount.white_amount_log).to eq(":0:33:32")
+      expect(poll_recount.officer_assignment_id_log).to eq(":#{officer_assignment.id}:101:102")
     end
 
     it "should update author_id if amount changes" do
@@ -78,24 +80,24 @@ describe Poll::Recount do
       expect(poll_recount.white_amount_log).to eq("")
       expect(poll_recount.author_id_log).to eq("")
 
-      author_A = create(:poll_officer).user
-      author_B = create(:poll_officer).user
-      author_C = create(:poll_officer).user
+      first_author = create(:poll_officer).user
+      second_author = create(:poll_officer).user
+      third_author = create(:poll_officer).user
 
       poll_recount.white_amount = 33
-      poll_recount.author_id = author_A.id
+      poll_recount.author_id = first_author.id
       poll_recount.save!
 
       poll_recount.white_amount = 32
-      poll_recount.author_id = author_B.id
+      poll_recount.author_id = second_author.id
       poll_recount.save!
 
       poll_recount.white_amount = 34
-      poll_recount.author_id = author_C.id
+      poll_recount.author_id = third_author.id
       poll_recount.save!
 
-      expect(poll_recount.white_amount_log).to eq(":33:32")
-      expect(poll_recount.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
+      expect(poll_recount.white_amount_log).to eq(":0:33:32")
+      expect(poll_recount.author_id_log).to eq(":#{author.id}:#{first_author.id}:#{second_author.id}")
     end
   end
 

spec/models/poll/shift_spec.rb

@@ -28,7 +28,7 @@ describe :shift do
 
   describe "officer_assignments" do
 
-    it "should create corresponding officer_assignments" do
+    it "should create and destroy corresponding officer_assignments" do
       poll1 = create(:poll)
       poll2 = create(:poll)
       poll3 = create(:poll)
@@ -39,21 +39,45 @@ describe :shift do
       booth_assignment1 = create(:poll_booth_assignment, poll: poll1, booth: booth)
       booth_assignment2 = create(:poll_booth_assignment, poll: poll2, booth: booth)
 
-      shift = create(:poll_shift, booth: booth, officer: officer, date: Date.current)
+      expect { create(:poll_shift, booth: booth, officer: officer, date: Date.current) }.to change {Poll::OfficerAssignment.all.count}.by(2)
 
       officer_assignments = Poll::OfficerAssignment.all
-      expect(officer_assignments.count).to eq(2)
-
       oa1 = officer_assignments.first
       oa2 = officer_assignments.second
 
       expect(oa1.officer).to eq(officer)
       expect(oa1.date).to eq(Date.current)
       expect(oa1.booth_assignment).to eq(booth_assignment1)
+      expect(oa1.final).to be_falsey
 
       expect(oa2.officer).to eq(officer)
       expect(oa2.date).to eq(Date.current)
       expect(oa2.booth_assignment).to eq(booth_assignment2)
+      expect(oa2.final).to be_falsey
+
+      create(:poll_officer_assignment, officer: officer, booth_assignment: booth_assignment1, date: Date.tomorrow)
+
+      expect { Poll::Shift.last.destroy }.to change {Poll::OfficerAssignment.all.count}.by(-2)
+    end
+
+    it "should create final officer_assignments" do
+      poll = create(:poll)
+      booth = create(:poll_booth)
+      officer = create(:poll_officer)
+
+      booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+
+      shift = create(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :recount_scrutiny)
+
+      officer_assignments = Poll::OfficerAssignment.all
+      expect(officer_assignments.count).to eq(1)
+
+      officer_assignment = officer_assignments.first
+
+      expect(officer_assignment.officer).to eq(officer)
+      expect(officer_assignment.date).to eq(Date.current)
+      expect(officer_assignment.booth_assignment).to eq(booth_assignment)
+      expect(officer_assignment.final).to be_truthy
     end
 
   end

spec/models/poll/voter_spec.rb

@@ -83,6 +83,64 @@ describe :voter do
       expect(voter.errors.messages[:document_number]).to eq(["User has already voted"])
     end
 
+    context "origin" do
+
+      it "should not be valid without an origin" do
+        voter.origin = nil
+        expect(voter).to_not be_valid
+      end
+
+      it "should not be valid without a valid origin" do
+        voter.origin = "invalid_origin"
+        expect(voter).to_not be_valid
+      end
+
+      it "should be valid with a booth origin" do
+        voter.origin = "booth"
+        expect(voter).to be_valid
+      end
+
+      it "should be valid with a web origin" do
+        voter.origin = "web"
+        expect(voter).to be_valid
+      end
+
+    end
+
+  end
+
+  describe "scopes" do
+
+    describe "#web" do
+      it "returns voters with a web origin" do
+        voter1 = create(:poll_voter, origin: "web")
+        voter2 = create(:poll_voter, origin: "web")
+        voter3 = create(:poll_voter, origin: "booth")
+
+        web_voters = Poll::Voter.web
+
+        expect(web_voters.count).to eq(2)
+        expect(web_voters).to     include(voter1)
+        expect(web_voters).to     include(voter2)
+        expect(web_voters).to_not include(voter3)
+      end
+    end
+
+    describe "#booth" do
+      it "returns voters with a booth origin" do
+        voter1 = create(:poll_voter, origin: "booth")
+        voter2 = create(:poll_voter, origin: "booth")
+        voter3 = create(:poll_voter, origin: "web")
+
+        booth_voters = Poll::Voter.booth
+
+        expect(booth_voters.count).to eq(2)
+        expect(booth_voters).to     include(voter1)
+        expect(booth_voters).to     include(voter2)
+        expect(booth_voters).to_not include(voter3)
+      end
+    end
+
   end
 
   describe "save" do

spec/support/common_actions.rb

@@ -24,6 +24,17 @@ module CommonActions
     click_button 'Enter'
   end
 
+  def login_through_form_as_officer(user)
+    visit root_path
+    click_link 'Sign in'
+
+    fill_in 'user_login', with: user.email
+    fill_in 'user_password', with: user.password
+
+    click_button 'Enter'
+    visit new_officing_residence_path
+  end
+
   def login_as_authenticated_manager
     expected_response = {login: login, user_key: user_key, date: date}.with_indifferent_access
     login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S")
@@ -287,4 +298,26 @@ module CommonActions
     end
   end
 
+  def vote_for_poll_via_web
+    visit question_path(question)
+
+    click_link 'Answer this question'
+    click_link 'Yes'
+
+    expect(page).to_not have_link('Yes')
+    expect(Poll::Voter.count).to eq(1)
+  end
+
+  def vote_for_poll_via_booth
+    visit new_officing_residence_path
+    officing_verify_residence
+
+    expect(page).to have_content poll.name
+
+    first(:button, "Confirm vote").click
+    expect(page).to have_content "Vote introduced!"
+
+    expect(Poll::Voter.count).to eq(1)
+  end
+
 end