<% if proposal.successful? %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index e25bdf9f7..ade0972d8 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -117,6 +117,13 @@
<%= t("proposals.show.author") %>
<% end %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 29c81c074..67d8eef2c 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -481,6 +481,7 @@ en:
help_text_1: "Voting takes place when a citizen proposal supports reaches 1% of the census with voting rights. Voting can also include questions that the City Council ask to the citizens decision."
help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government."
show:
+ already_voted_in_booth: "You have already participated in a booth for this poll."
dates_title: "Participation dates"
cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
signin: Sign in
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index c5322c84c..aaa59a900 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -402,7 +402,7 @@ es:
proposal:
created: "¡Has creado una propuesta!"
share:
- guide: "Compártela para que la gente empieze a apoyarla."
+ guide: "Compártela para que la gente empiece a apoyarla."
edit: "Antes de que se publique podrás modificar el texto a tu gusto."
view_proposal: "Ahora no, ir a mi propuesta"
improve_info: "Mejora tu campaña y consigue más apoyos"
@@ -481,6 +481,7 @@ es:
help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía."
help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno."
show:
+ already_voted_in_booth: "Ya has participado en esta votación en una urna."
dates_title: "Fechas de participación"
cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
signin: iniciar sesión
diff --git a/db/migrate/20171002121658_add_origin_to_poll_voters.rb b/db/migrate/20171002121658_add_origin_to_poll_voters.rb
new file mode 100644
index 000000000..845c1b774
--- /dev/null
+++ b/db/migrate/20171002121658_add_origin_to_poll_voters.rb
@@ -0,0 +1,5 @@
+class AddOriginToPollVoters < ActiveRecord::Migration
+ def change
+ add_column :poll_voters, :origin, :string
+ end
+end
diff --git a/db/migrate/20171002122312_create_poll_recount.rb b/db/migrate/20171002122312_create_poll_recount.rb
new file mode 100644
index 000000000..807f1c84e
--- /dev/null
+++ b/db/migrate/20171002122312_create_poll_recount.rb
@@ -0,0 +1,24 @@
+class CreatePollRecount < ActiveRecord::Migration
+ def change
+ create_table :poll_recounts do |t|
+ t.integer :author_id
+ t.string :origin
+ t.date :date
+ t.integer :booth_assignment_id
+ t.integer :officer_assignment_id
+ t.text :officer_assignment_id_log, default: ""
+ t.text :author_id_log, default: ""
+ t.integer :white_amount
+ t.text :white_amount_log, default: ""
+ t.integer :null_amount
+ t.text :null_amount_log, default: ""
+ t.integer :total_amount
+ t.text :total_amount_log, default: ""
+ end
+
+ add_index :poll_recounts, :booth_assignment_id
+ add_index :poll_recounts, :officer_assignment_id
+ add_foreign_key :poll_recounts, :poll_booth_assignments, column: :booth_assignment_id
+ add_foreign_key :poll_recounts, :poll_officer_assignments, column: :officer_assignment_id
+ end
+end
diff --git a/db/migrate/20171002191347_add_default_to_recount_amounts.rb b/db/migrate/20171002191347_add_default_to_recount_amounts.rb
new file mode 100644
index 000000000..b90e86aae
--- /dev/null
+++ b/db/migrate/20171002191347_add_default_to_recount_amounts.rb
@@ -0,0 +1,7 @@
+class AddDefaultToRecountAmounts < ActiveRecord::Migration
+ def change
+ change_column_default :poll_recounts, :white_amount, 0
+ change_column_default :poll_recounts, :null_amount, 0
+ change_column_default :poll_recounts, :total_amount, 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 500f03540..af121fa0e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170927110953) do
+ActiveRecord::Schema.define(version: 20171002191347) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -690,6 +690,25 @@ ActiveRecord::Schema.define(version: 20170927110953) do
add_index "poll_questions", ["proposal_id"], name: "index_poll_questions_on_proposal_id", using: :btree
add_index "poll_questions", ["tsv"], name: "index_poll_questions_on_tsv", using: :gin
+ create_table "poll_recounts", force: :cascade do |t|
+ t.integer "author_id"
+ t.string "origin"
+ t.date "date"
+ t.integer "booth_assignment_id"
+ t.integer "officer_assignment_id"
+ t.text "officer_assignment_id_log", default: ""
+ t.text "author_id_log", default: ""
+ t.integer "white_amount", default: 0
+ t.text "white_amount_log", default: ""
+ t.integer "null_amount", default: 0
+ t.text "null_amount_log", default: ""
+ t.integer "total_amount", default: 0
+ t.text "total_amount_log", default: ""
+ end
+
+ add_index "poll_recounts", ["booth_assignment_id"], name: "index_poll_recounts_on_booth_assignment_id", using: :btree
+ add_index "poll_recounts", ["officer_assignment_id"], name: "index_poll_recounts_on_officer_assignment_id", using: :btree
+
create_table "poll_shifts", force: :cascade do |t|
t.integer "booth_id"
t.integer "officer_id"
@@ -733,6 +752,7 @@ ActiveRecord::Schema.define(version: 20170927110953) do
t.integer "answer_id"
t.integer "officer_assignment_id"
t.integer "user_id"
+ t.string "origin"
end
add_index "poll_voters", ["booth_assignment_id"], name: "index_poll_voters_on_booth_assignment_id", using: :btree
@@ -1126,6 +1146,8 @@ ActiveRecord::Schema.define(version: 20170927110953) do
add_foreign_key "poll_questions", "polls"
add_foreign_key "poll_questions", "proposals"
add_foreign_key "poll_questions", "users", column: "author_id"
+ add_foreign_key "poll_recounts", "poll_booth_assignments", column: "booth_assignment_id"
+ add_foreign_key "poll_recounts", "poll_officer_assignments", column: "officer_assignment_id"
add_foreign_key "poll_voters", "polls"
add_foreign_key "poll_white_results", "poll_booth_assignments", column: "booth_assignment_id"
add_foreign_key "poll_white_results", "poll_officer_assignments", column: "officer_assignment_id"
diff --git a/spec/factories.rb b/spec/factories.rb
index b0a287aea..c21c35b4e 100644
--- a/spec/factories.rb
+++ b/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
@@ -569,6 +576,11 @@ FactoryGirl.define do
origin { 'web' }
end
+ factory :poll_recount, class: 'Poll::Recount' do
+ association :author, factory: :user
+ origin { 'web' }
+ end
+
factory :officing_residence, class: 'Officing::Residence' do
user
association :officer, factory: :poll_officer
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 6eb64f6e1..8d30dc5eb 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -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)
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index 8b9cf3e4e..cb5349814 100644
--- a/spec/features/home_spec.rb
+++ b/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
diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb
index 835903ab9..f7e1ad8ef 100644
--- a/spec/features/officing/results_spec.rb
+++ b/spec/features/officing/results_spec.rb
@@ -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),
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb
index 047c71146..8a90fb4a8 100644
--- a/spec/features/polls/polls_spec.rb
+++ b/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
diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb
new file mode 100644
index 000000000..08bc6f963
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb
index 5a6c4b734..0934c7cfe 100644
--- a/spec/models/abilities/administrator_spec.rb
+++ b/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) }
diff --git a/spec/models/abilities/everyone_spec.rb b/spec/models/abilities/everyone_spec.rb
index fcfff4e42..21568c999 100644
--- a/spec/models/abilities/everyone_spec.rb
+++ b/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
\ No newline at end of file
+
+ it { should be_able_to(:read_results, finished_budget) }
+ it { should_not be_able_to(:read_results, reviewing_ballot_budget) }
+end
diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb
index 10ccafbb6..d66cdc18c 100644
--- a/spec/models/poll/answer_spec.rb
+++ b/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
diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb
index ac0cc44ea..5083d7439 100644
--- a/spec/models/poll/poll_spec.rb
+++ b/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
diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb
new file mode 100644
index 000000000..2a5ed16a7
--- /dev/null
+++ b/spec/models/poll/recount_spec.rb
@@ -0,0 +1,104 @@
+require 'rails_helper'
+
+describe Poll::Recount do
+
+ describe "logging changes" do
+ 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
+
+ expect(poll_recount.white_amount_log).to eq("")
+
+ poll_recount.white_amount = 33
+ poll_recount.save
+ poll_recount.white_amount = 32
+ poll_recount.save
+ poll_recount.white_amount = 34
+ poll_recount.save
+
+ expect(poll_recount.white_amount_log).to eq(":0:33:32")
+ end
+
+ it "should update null_amount_log if null_amount changes" do
+ poll_recount.null_amount = 33
+
+ expect(poll_recount.null_amount_log).to eq("")
+
+ poll_recount.null_amount = 33
+ poll_recount.save
+ poll_recount.null_amount = 32
+ poll_recount.save
+ poll_recount.null_amount = 34
+ poll_recount.save
+
+ expect(poll_recount.null_amount_log).to eq(":0:33:32")
+ end
+
+ it "should update total_amount_log if total_amount changes" do
+ poll_recount.total_amount = 33
+
+ expect(poll_recount.total_amount_log).to eq("")
+
+ poll_recount.total_amount = 33
+ poll_recount.save
+ poll_recount.total_amount = 32
+ poll_recount.save
+ poll_recount.total_amount = 34
+ poll_recount.save
+
+ expect(poll_recount.total_amount_log).to eq(":0:33:32")
+ end
+
+ it "should update officer_assignment_id_log if amount changes" do
+ poll_recount.white_amount = 33
+
+ expect(poll_recount.white_amount_log).to eq("")
+ expect(poll_recount.officer_assignment_id_log).to eq("")
+
+ poll_recount.white_amount = 33
+ poll_recount.officer_assignment = create(:poll_officer_assignment, id: 101)
+ poll_recount.save
+
+ poll_recount.white_amount = 32
+ poll_recount.officer_assignment = create(:poll_officer_assignment, id: 102)
+ poll_recount.save
+
+ poll_recount.white_amount = 34
+ poll_recount.officer_assignment = create(:poll_officer_assignment, id: 103)
+ poll_recount.save
+
+ 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
+ poll_recount.white_amount = 33
+
+ expect(poll_recount.white_amount_log).to eq("")
+ expect(poll_recount.author_id_log).to eq("")
+
+ 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 = first_author.id
+ poll_recount.save!
+
+ poll_recount.white_amount = 32
+ poll_recount.author_id = second_author.id
+ poll_recount.save!
+
+ poll_recount.white_amount = 34
+ poll_recount.author_id = third_author.id
+ poll_recount.save!
+
+ 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
+
+end
diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb
index c1c248550..f306248dc 100644
--- a/spec/models/poll/voter_spec.rb
+++ b/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
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 8b8470293..97f05294c 100644
--- a/spec/support/common_actions.rb
+++ b/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