+ <%= t("polls.show.stats.total_votes") %>
+ <%= @stats[:total_participants] %>
+
| <%= t("polls.show.stats.votes") %> | +<%= t("polls.show.stats.web") %> | +<%= t("polls.show.stats.booth") %> | +<%= t("polls.show.stats.total") %> | +
|---|---|---|---|
| <%= t("polls.show.stats.valid") %> | +<%= @stats[:total_web_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_booth_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_valid_votes] %> + (<%= number_to_percentage(@stats[:total_valid_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) | +
| <%= t("polls.show.stats.white") %> | +<%= @stats[:total_web_white] %> + (<%= number_to_percentage(@stats[:white_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_booth_white] %> + (<%= number_to_percentage(@stats[:white_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_white_votes] %> + (<%= number_to_percentage(@stats[:total_white_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) | +
| <%= t("polls.show.stats.null_votes") %> | +<%= @stats[:total_web_null] %> + (<%= number_to_percentage(@stats[:null_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_booth_null] %> + (<%= number_to_percentage(@stats[:null_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_null_votes] %> + (<%= number_to_percentage(@stats[:total_null_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) | +
| <%= t("polls.show.stats.total") %> | +<%= @stats[:total_participants_web] %> + (<%= number_to_percentage(@stats[:total_participants_web_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_participants_booth] %> + (<%= number_to_percentage(@stats[:total_participants_booth_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) | +<%= @stats[:total_participants_web] + @stats[:total_participants_booth] %> | +
#{Faker::Lorem.paragraphs.join('
')}
" open_at = rand(2.months.ago..2.months.from_now) - answers = Faker::Lorem.words((2..4).to_a.sample).map { |answer| answer.capitalize } question = Poll::Question.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), - valid_answers: answers.join(', '), poll: poll) - answers.each do |answer| - Poll::Question::Answer.create!(question: question, title: answer, description: Faker::ChuckNorris.fact) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) end end @@ -599,7 +597,10 @@ print "Creating Poll Questions from Proposals" 3.times do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first - question = Poll::Question.create(valid_answers: "Yes, No", poll: poll) + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end question.copy_attributes_from_proposal(proposal) question.save! end @@ -610,7 +611,10 @@ print "Creating Successful Proposals" 10.times do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first - question = Poll::Question.create(valid_answers: "Yes, No", poll: poll) + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end question.copy_attributes_from_proposal(proposal) question.save! end @@ -656,8 +660,7 @@ print "Creating legislation processes" allegations_phase_enabled: true, draft_publication_enabled: true, result_publication_enabled: true, - published: true - ) + published: true) end ::Legislation::Process.all.each do |process| diff --git a/lib/census_api.rb b/lib/census_api.rb index 931781c6d..4fdbd37cb 100644 --- a/lib/census_api.rb +++ b/lib/census_api.rb @@ -84,7 +84,7 @@ class CensusApi end def stubbed_response(document_type, document_number) - if document_number == "12345678Z" && document_type == "1" + if (document_number == "12345678Z" || document_number == "12345678Y") && document_type == "1" stubbed_valid_response else stubbed_invalid_response diff --git a/spec/factories.rb b/spec/factories.rb index f7b10bba1..b98fc7adb 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -503,7 +503,13 @@ FactoryGirl.define do poll association :author, factory: :user sequence(:title) { |n| "Question title #{n}" } - valid_answers { Faker::Lorem.words(3).join(', ') } + + trait :with_answers do + after(:create) do |question, _evaluator| + create(:poll_question_answer, question: question, title: "Yes") + create(:poll_question_answer, question: question, title: "No") + end + end end factory :poll_question_answer, class: 'Poll::Question::Answer' do @@ -574,16 +580,16 @@ FactoryGirl.define do end factory :poll_answer, class: 'Poll::Answer' do - association :question, factory: :poll_question + association :question, factory: [:poll_question, :with_answers] association :author, factory: [:user, :level_two] - answer { question.valid_answers.sample } + answer { question.question_answers.sample.title } end factory :poll_partial_result, class: 'Poll::PartialResult' do - association :question, factory: :poll_question + association :question, factory: [:poll_question, :with_answers] association :author, factory: :user origin { 'web' } - answer { question.valid_answers.sample } + answer { question.question_answers.sample.title } end factory :poll_recount, class: 'Poll::Recount' do diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb index 20be138b9..48d10ad39 100644 --- a/spec/features/admin/poll/officer_assignments_spec.rb +++ b/spec/features/admin/poll/officer_assignments_spec.rb @@ -30,9 +30,9 @@ feature 'Officer Assignments' do expect(page).to have_content officer2.name expect(page).to_not have_content officer3.name end - end + end - scenario "Search", :js do + scenario "Search", :js do poll = create(:poll) booth = create(:poll_booth) @@ -62,7 +62,6 @@ feature 'Officer Assignments' do expect(page).to have_content officer2.name expect(page).to_not have_content officer3.name end - end - + end end \ No newline at end of file diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index a9a33447f..9c2d3fcf1 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -261,8 +261,13 @@ feature 'Admin polls' do booth_assignment_2 = create(:poll_booth_assignment, poll: poll) booth_assignment_3 = create(:poll_booth_assignment, poll: poll) - question_1 = create(:poll_question, poll: poll, valid_answers: "Yes,No") - question_2 = create(:poll_question, poll: poll, valid_answers: "Today,Tomorrow") + question_1 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Yes', question: question_1) + create(:poll_question_answer, title: 'No', question: question_1) + + question_2 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Today', question: question_2) + create(:poll_question_answer, title: 'Tomorrow', question: question_2) [booth_assignment_1, booth_assignment_2, booth_assignment_3].each do |ba| create(:poll_partial_result, @@ -279,30 +284,32 @@ feature 'Admin polls' do create(:poll_recount, booth_assignment: booth_assignment_1, white_amount: 21, - null_amount: 44) + null_amount: 44, + total_amount: 66) visit admin_poll_path(poll) click_link "Results" expect(page).to have_content(question_1.title) - question_1.valid_answers.each_with_index do |answer, i| + question_1.question_answers.each_with_index do |answer, i| within("#question_#{question_1.id}_#{i}_result") do - expect(page).to have_content(answer) + expect(page).to have_content(answer.title) expect(page).to have_content([33, 0][i]) end end expect(page).to have_content(question_2.title) - question_2.valid_answers.each_with_index do |answer, i| + question_2.question_answers.each_with_index do |answer, i| within("#question_#{question_2.id}_#{i}_result") do - expect(page).to have_content(answer) + expect(page).to have_content(answer.title) expect(page).to have_content([0, 15][i]) end end within('#white_results') { expect(page).to have_content('21') } within('#null_results') { expect(page).to have_content('44') } + within('#total_results') { expect(page).to have_content('66') } end end end diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 35df2e20e..bddd1b6b1 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -102,11 +102,11 @@ feature 'Admin shifts' do shift2 = create(:poll_shift, :recount_scrutiny_task, officer: officer, booth: booth, date: Time.zone.tomorrow) vote_collection_dates = (Date.current..poll.ends_at.to_date).to_a - .reject { |date| date == Time.zone.today } - .map { |date| I18n.l(date, format: :long) } + .reject { |date| date == Time.zone.today } + .map { |date| I18n.l(date, format: :long) } recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a - .reject { |date| date == Time.zone.tomorrow } - .map { |date| I18n.l(date, format: :long) } + .reject { |date| date == Time.zone.tomorrow } + .map { |date| I18n.l(date, format: :long) } visit available_admin_booths_path diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index 73d190cb9..40baf6423 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -87,7 +87,6 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end - end end diff --git a/spec/features/comments/polls_spec.rb b/spec/features/comments/polls_spec.rb index 8ef528cd3..0fe01cf06 100644 --- a/spec/features/comments/polls_spec.rb +++ b/spec/features/comments/polls_spec.rb @@ -21,7 +21,7 @@ feature 'Commenting polls' do end scenario 'Show' do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" parent_comment = create(:comment, commentable: poll) first_child = create(:comment, commentable: poll, parent: parent_comment) @@ -243,7 +243,7 @@ feature 'Commenting polls' do end scenario "Flagging as inappropriate", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" comment = create(:comment, commentable: poll) @@ -261,7 +261,7 @@ feature 'Commenting polls' do end scenario "Undoing flagging as inappropriate", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" comment = create(:comment, commentable: poll) Flag.flag(user, comment) @@ -280,7 +280,7 @@ feature 'Commenting polls' do end scenario "Flagging turbolinks sanity check", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" poll = create(:poll, title: "Should we change the world?") comment = create(:comment, commentable: poll) @@ -310,7 +310,7 @@ feature 'Commenting polls' do feature "Moderators" do scenario "can create comment as a moderator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" moderator = create(:moderator) @@ -330,7 +330,7 @@ feature 'Commenting polls' do end scenario "can create reply as a moderator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" citizen = create(:user, username: "Ana") manuela = create(:user, username: "Manuela") @@ -359,7 +359,7 @@ feature 'Commenting polls' do end scenario "can not comment as an administrator" do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" moderator = create(:moderator) @@ -372,7 +372,7 @@ feature 'Commenting polls' do feature "Administrators" do scenario "can create comment as an administrator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" admin = create(:administrator) @@ -392,7 +392,7 @@ feature 'Commenting polls' do end scenario "can create reply as an administrator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" citizen = create(:user, username: "Ana") manuela = create(:user, username: "Manuela") @@ -421,7 +421,7 @@ feature 'Commenting polls' do end scenario "can not comment as a moderator" do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" admin = create(:administrator) diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 3d7c6acf8..39cd84760 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -394,7 +394,7 @@ feature 'Debates' do end scenario 'Debates are ordered by recommendations when there is a user logged', :js do - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") user = create(:user) create(:follow, followable: proposal, user: user) login_as(user) @@ -830,7 +830,7 @@ feature 'Debates' do debate2 = create(:debate, title: "Show what you got", cached_votes_total: 1, tag_list: "Sport") debate3 = create(:debate, title: "Do not display with same tag", cached_votes_total: 100, tag_list: "Sport") debate4 = create(:debate, title: "Do not display", cached_votes_total: 1) - proposal1 = create(:proposal, tag_list: "Sport") + proposal1 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal1, user: user) visit debates_path diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index a26e8ce11..74b608ed6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -408,7 +408,6 @@ feature 'Emails' do end expect(page).to have_content 'It will be done next week.' - email = open_last_email expect(email).to have_subject('Someone has responded to your comment') expect(email).to deliver_to(user1) diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb index cb5349814..4854fff4d 100644 --- a/spec/features/home_spec.rb +++ b/spec/features/home_spec.rb @@ -27,7 +27,7 @@ feature "Home" do background do Setting['feature.user.recommendations'] = true user = create(:user) - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) login_as(user) end diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index f7e1ad8ef..252d4edd6 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -7,8 +7,13 @@ feature 'Officing Results' do @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer) @poll = @officer_assignment.booth_assignment.poll @poll.update(ends_at: 1.day.ago) - @question_1 = create(:poll_question, poll: @poll, valid_answers: "Yes,No") - @question_2 = create(:poll_question, poll: @poll, valid_answers: "Today,Tomorrow") + @question_1 = create(:poll_question, poll: @poll) + create(:poll_question_answer, title: 'Yes', question: @question_1) + create(:poll_question_answer, title: 'No', question: @question_1) + @question_2 = create(:poll_question, poll: @poll) + create(:poll_question_answer, title: 'Today', question: @question_2) + create(:poll_question_answer, title: 'Tomorrow', question: @question_2) + login_as(@poll_officer.user) end @@ -53,9 +58,7 @@ feature 'Officing Results' do expect(page).to_not have_content('Your results') booth_name = @officer_assignment.booth_assignment.booth.name - date = I18n.l(@poll.starts_at.to_date, format: :long) select booth_name, from: 'officer_assignment_id' - select date, from: 'date' fill_in "questions[#{@question_1.id}][0]", with: '100' fill_in "questions[#{@question_1.id}][1]", with: '200' @@ -71,8 +74,8 @@ feature 'Officing Results' do expect(page).to have_content('Your results') - within("#results_#{@officer_assignment.booth_assignment_id}_#{@poll.starts_at.to_date.strftime('%Y%m%d')}") do - expect(page).to have_content(date) + within("#results_#{@officer_assignment.booth_assignment_id}_#{Date.current.strftime('%Y%m%d')}") do + expect(page).to have_content(I18n.l(Date.current, format: :long)) expect(page).to have_content(booth_name) end end @@ -81,9 +84,9 @@ feature 'Officing Results' do partial_result = create(:poll_partial_result, officer_assignment: @officer_assignment, booth_assignment: @officer_assignment.booth_assignment, - date: @poll.starts_at, + date: Date.current, question: @question_1, - answer: @question_1.valid_answers[0], + answer: @question_1.question_answers.first.title, author: @poll_officer.user, amount: 7777) @@ -94,9 +97,7 @@ feature 'Officing Results' do visit new_officing_poll_result_path(@poll) booth_name = partial_result.booth_assignment.booth.name - date = I18n.l(partial_result.date, format: :long) select booth_name, from: 'officer_assignment_id' - select date, from: 'date' fill_in "questions[#{@question_1.id}][0]", with: '5555' fill_in "questions[#{@question_1.id}][1]", with: '200' @@ -143,13 +144,13 @@ feature 'Officing Results' do expect(page).to have_content(@officer_assignment.booth_assignment.booth.name) expect(page).to have_content(@question_1.title) - @question_1.valid_answers.each_with_index do |answer, i| - within("#question_#{@question_1.id}_#{i}_result") { expect(page).to have_content(answer) } + @question_1.question_answers.each_with_index do |answer, i| + within("#question_#{@question_1.id}_#{i}_result") { expect(page).to have_content(answer.title) } end expect(page).to have_content(@question_2.title) - @question_2.valid_answers.each_with_index do |answer, i| - within("#question_#{@question_2.id}_#{i}_result") { expect(page).to have_content(answer) } + @question_2.question_answers.each_with_index do |answer, i| + within("#question_#{@question_2.id}_#{i}_result") { expect(page).to have_content(answer.title) } end within('#white_results') { expect(page).to have_content('21') } diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 2a54bbff1..338b416ea 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -107,7 +107,7 @@ feature 'Poll Officing' do expect(page).to_not have_css('#moderation_menu') end - scenario 'Officing dashboard available for multiple sessions' do + scenario 'Officing dashboard available for multiple sessions', :js do poll = create(:poll) booth = create(:poll_booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) @@ -117,6 +117,9 @@ feature 'Poll Officing' do officer1 = create(:poll_officer, user: user1) officer2 = create(:poll_officer, user: user2) + create(:poll_shift, officer: officer1, booth: booth, date: Date.current, task: :vote_collection) + create(:poll_shift, officer: officer2, booth: booth, date: Date.current, task: :vote_collection) + officer_assignment_1 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1) officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer2) @@ -134,7 +137,14 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - page.should have_content("Validate document") + select 'DNI', from: 'residence_document_type' + fill_in 'residence_document_number', with: "12345678Z" + fill_in 'residence_year_of_birth', with: '1980' + click_button 'Validate document' + expect(page).to have_content 'Document verified with Census' + click_button "Confirm vote" + expect(page).to have_content "Vote introduced!" + expect(Poll::Voter.where(document_number: '12345678Z', poll_id: poll, origin: 'booth', officer_id: officer1).count).to be(1) visit final_officing_polls_path page.should have_content("Polls ready for final recounting") @@ -144,7 +154,14 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - page.should have_content("Validate document") + select 'DNI', from: 'residence_document_type' + fill_in 'residence_document_number', with: "12345678Y" + fill_in 'residence_year_of_birth', with: '1980' + click_button 'Validate document' + expect(page).to have_content 'Document verified with Census' + click_button "Confirm vote" + expect(page).to have_content "Vote introduced!" + expect(Poll::Voter.where(document_number: '12345678Y', poll_id: poll, origin: 'booth', officer_id: officer2).count).to be(1) visit final_officing_polls_path page.should have_content("Polls ready for final recounting") diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index e36720038..7bf51473f 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -367,4 +367,17 @@ feature 'Polls' do end end + + context "Results and stats" do + scenario "See polls statistics", :js do + user = create(:user) + poll = create(:poll, summary: "Summary", description: "Description") + login_as user + visit poll_path(poll) + + click_link "Participation statistics" + + expect(page).to have_content("Total participation") + end + end end diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index d5770cd0e..ff9b71755 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -147,10 +147,36 @@ feature "Voter" do expect(page).to have_link('Yes') expect(page).to have_link('No') end - end end + scenario "Voting in poll and then verifiying account", :js do + user = create(:user) + + question = create(:poll_question, poll: poll) + answer1 = create(:poll_question_answer, question: question, title: 'Yes') + answer2 = create(:poll_question_answer, question: question, title: 'No') + + login_through_form_as_officer(officer.user) + vote_for_poll_via_booth + + visit root_path + click_link "Sign out" + + login_as user + visit account_path + click_link 'Verify my account' + + verify_residence + confirm_phone(user) + + visit poll_path(poll) + + expect(page).to_not have_link('Yes') + 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) + end + end end diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index 64dbf729f..3e1278bd7 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -725,10 +725,10 @@ describe Debate do end it "Should return debates ordered by cached_votes_total" do - debate1 = create(:debate, cached_votes_total: 1, tag_list: "Sport" ) - debate2 = create(:debate, cached_votes_total: 5, tag_list: "Sport" ) - debate3 = create(:debate, cached_votes_total: 10, tag_list: "Sport" ) - proposal = create(:proposal, tag_list: "Sport" ) + debate1 = create(:debate, cached_votes_total: 1, tag_list: "Sport") + debate2 = create(:debate, cached_votes_total: 5, tag_list: "Sport") + debate3 = create(:debate, cached_votes_total: 10, tag_list: "Sport") + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) result = Debate.recommendations(user).sort_by_recommendations @@ -741,7 +741,7 @@ describe Debate do it "Should return debates related with user interests" do debate1 = create(:debate, tag_list: "Sport") debate2 = create(:debate, tag_list: "Politics") - proposal1 = create(:proposal, tag_list: "Sport") + proposal1 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal1, user: user) result = Debate.recommendations(user) @@ -753,7 +753,7 @@ describe Debate do it "Should not return debates when user is the author" do debate1 = create(:debate, author: user, tag_list: "Sport") debate2 = create(:debate, tag_list: "Sport") - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) result = Debate.recommendations(user) diff --git a/spec/models/direct_upload_spec.rb b/spec/models/direct_upload_spec.rb index 5abe06765..8cfebf076 100644 --- a/spec/models/direct_upload_spec.rb +++ b/spec/models/direct_upload_spec.rb @@ -42,7 +42,7 @@ describe DirectUpload do proposal_document_direct_upload.save_attachment - expect(File.exists?(proposal_document_direct_upload.relation.attachment.path)).to eq(true) + expect(File.exist?(proposal_document_direct_upload.relation.attachment.path)).to eq(true) expect(proposal_document_direct_upload.relation.attachment.path).to include('cached_attachments') end @@ -57,7 +57,7 @@ describe DirectUpload do uploaded_path = proposal_document_direct_upload.relation.attachment.path proposal_document_direct_upload.destroy_attachment - expect(File.exists?(uploaded_path)).to eq(false) + expect(File.exist?(uploaded_path)).to eq(false) end end diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb index bd093a71e..62070529e 100644 --- a/spec/models/map_location_spec.rb +++ b/spec/models/map_location_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe MapLocation do - let(:map_location) { build(:map_location, :proposal_map_location ) } + let(:map_location) { build(:map_location, :proposal_map_location) } it "should be valid" do expect(map_location).to be_valid diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index 8731445cc..33cf833b6 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -25,9 +25,12 @@ describe Poll::Answer do expect(answer).to_not be_valid end - it "should be valid for answers included in the Poll::Question's list" do - skip "review when removing valid_answers" - question = create(:poll_question, valid_answers: 'One, Two, Three') + it "should be valid for answers included in the Poll::Question's question_answers list" do + question = create(:poll_question) + create(:poll_question_answer, title: 'One', question: question) + create(:poll_question_answer, title: 'Two', question: question) + create(:poll_question_answer, title: 'Three', question: question) + 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 @@ -40,7 +43,7 @@ describe Poll::Answer do let(:author) { create(:user, :level_two) } let(:poll) { create(:poll) } - let(:question) { create(:poll_question, poll: poll, valid_answers: "Yes, No") } + let(:question) { create(:poll_question, :with_answers, poll: poll) } it "creates a poll_voter with user and poll data" do answer = create(:poll_answer, question: question, author: author, answer: "Yes") diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb index dd6176a06..316b17524 100644 --- a/spec/models/poll/partial_result_spec.rb +++ b/spec/models/poll/partial_result_spec.rb @@ -4,12 +4,16 @@ describe Poll::PartialResult 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_partial_result, question: q, answer: 'One')).to be_valid - expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid - expect(build(:poll_partial_result, question: q, answer: 'Three')).to be_valid + question = create(:poll_question) + create(:poll_question_answer, title: 'One', question: question) + create(:poll_question_answer, title: 'Two', question: question) + create(:poll_question_answer, title: 'Three', question: question) - expect(build(:poll_partial_result, question: q, answer: 'Four')).to_not be_valid + expect(build(:poll_partial_result, question: question, answer: 'One')).to be_valid + expect(build(:poll_partial_result, question: question, answer: 'Two')).to be_valid + expect(build(:poll_partial_result, question: question, answer: 'Three')).to be_valid + + expect(build(:poll_partial_result, question: question, answer: 'Four')).to_not be_valid end end @@ -57,24 +61,24 @@ describe Poll::PartialResult do expect(partial_result.amount_log).to eq("") expect(partial_result.author_id_log).to eq("") - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user + author1 = create(:poll_officer).user + author2 = create(:poll_officer).user + author3 = create(:poll_officer).user partial_result.amount = 33 - partial_result.author_id = author_A.id + partial_result.author_id = author1.id partial_result.save! partial_result.amount = 32 - partial_result.author_id = author_B.id + partial_result.author_id = author2.id partial_result.save! partial_result.amount = 34 - partial_result.author_id = author_C.id + partial_result.author_id = author3.id partial_result.save! expect(partial_result.amount_log).to eq(":33:32") - expect(partial_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") + expect(partial_result.author_id_log).to eq(":#{author1.id}:#{author2.id}") end end diff --git a/spec/models/poll/question_spec.rb b/spec/models/poll/question_spec.rb index 60f9d6716..8c8a94d35 100644 --- a/spec/models/poll/question_spec.rb +++ b/spec/models/poll/question_spec.rb @@ -3,13 +3,6 @@ require 'rails_helper' RSpec.describe Poll::Question, type: :model do let(:poll_question) { build(:poll_question) } - describe "#valid_answers" do - it "gets a comma-separated string, but returns an array" do - poll_question.valid_answers = "Yes, No" - expect(poll_question.valid_answers).to eq(["Yes", "No"]) - end - end - describe "#poll_question_id" do it "should be invalid if a poll is not selected" do poll_question.poll_id = nil @@ -27,7 +20,6 @@ RSpec.describe Poll::Question, type: :model do create_list(:geozone, 3) p = create(:proposal) poll_question.copy_attributes_from_proposal(p) - expect(poll_question.valid_answers).to eq(['Yes', 'No']) expect(poll_question.author).to eq(p.author) expect(poll_question.author_visible_name).to eq(p.author.name) expect(poll_question.proposal_id).to eq(p.id) diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb new file mode 100644 index 000000000..ee431fa97 --- /dev/null +++ b/spec/models/poll/stats_spec.rb @@ -0,0 +1,45 @@ +require 'rails_helper' + +describe Poll::Stats do + + describe "Calculate stats" do + it "Generate the correct stats" do + poll = create(:poll) + booth = create(:poll_booth) + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + create(:poll_voter, poll: poll, origin: 'web') + 3.times {create(:poll_voter, poll: poll, origin: 'booth')} + create(:poll_voter, poll: poll) + create(:poll_recount, origin: 'booth', white_amount: 1, null_amount: 0, total_amount: 2, booth_assignment_id: booth_assignment.id) + stats = Poll::Stats.new(poll).generate + + expect(stats[:total_participants]).to eq(5) + expect(stats[:total_participants_web]).to eq(2) + expect(stats[:total_participants_booth]).to eq(3) + expect(stats[:total_valid_votes]).to eq(4) + expect(stats[:total_white_votes]).to eq(1) + expect(stats[:total_null_votes]).to eq(0) + + expect(stats[:total_web_valid]).to eq(2) + expect(stats[:total_web_white]).to eq(0) + expect(stats[:total_web_null]).to eq(0) + + expect(stats[:total_booth_valid]).to eq(2) + expect(stats[:total_booth_white]).to eq(1) + expect(stats[:total_booth_null]).to eq(0) + + expect(stats[:total_participants_web_percentage]).to eq(40) + expect(stats[:total_participants_booth_percentage]).to eq(60) + expect(stats[:valid_percentage_web]).to eq(50) + expect(stats[:white_percentage_web]).to eq(0) + expect(stats[:null_percentage_web]).to eq(0) + expect(stats[:valid_percentage_booth]).to eq(50) + expect(stats[:white_percentage_booth]).to eq(100) + expect(stats[:null_percentage_booth]).to eq(0) + expect(stats[:total_valid_percentage]).to eq(80) + expect(stats[:total_white_percentage]).to eq(20) + expect(stats[:total_null_percentage]).to eq(0) + end + end + +end \ No newline at end of file diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 588bd4057..29338a62f 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -903,10 +903,10 @@ describe Proposal do end it "Should return proposals ordered by cached_votes_up" do - proposal1 = create(:proposal, cached_votes_up: 1, tag_list: "Sport" ) - proposal2 = create(:proposal, cached_votes_up: 5, tag_list: "Sport" ) - proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport" ) - proposal4 = create(:proposal, tag_list: "Sport" ) + proposal1 = create(:proposal, cached_votes_up: 1, tag_list: "Sport") + proposal2 = create(:proposal, cached_votes_up: 5, tag_list: "Sport") + proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport") + proposal4 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal4, user: user) result = Proposal.recommendations(user).sort_by_recommendations diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb index ccbcd5625..65ece1f25 100644 --- a/spec/shared/features/mappable.rb +++ b/spec/shared/features/mappable.rb @@ -2,7 +2,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, include ActionView::Helpers - let!(:user) { create(:user, :level_two) } + let!(:user) { create(:user, :level_two) } before do Setting['feature.map'] = true @@ -11,7 +11,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_new_path}" do let!(:arguments) { {} } - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } before { set_arguments(arguments, mappable, mappable_path_arguments) } @@ -77,10 +77,10 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_edit_path}" do - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } - before { skip } unless mappable_edit_path.present? + before { skip } if mappable_edit_path.blank? scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do login_as mappable.author @@ -143,13 +143,13 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_show_path}" do let!(:arguments) { {} } - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } before { set_arguments(arguments, mappable, mappable_path_arguments) } scenario "Should display map on #{mappable_factory_name} show page", :js do - arguments.merge!("id": mappable.id) + arguments[:id] = mappable.id visit send(mappable_show_path, arguments) @@ -157,9 +157,9 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, end scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do - mappable_without_map = create("#{mappable_factory_name}".to_sym) + mappable_without_map = create(mappable_factory_name.to_s.to_sym) set_arguments(arguments, mappable_without_map, mappable_path_arguments) - arguments.merge!("id": mappable_without_map.id) + arguments[:id] = mappable_without_map.id visit send(mappable_show_path, arguments) @@ -168,7 +168,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, scenario "Should not display map on #{mappable_factory_name} show page when feature.map is disable", :js do Setting['feature.map'] = false - arguments.merge!("id": mappable.id) + arguments[:id] = mappable.id visit send(mappable_show_path, arguments) @@ -212,9 +212,7 @@ def submit_budget_investment_form end def set_arguments(arguments, mappable, mappable_path_arguments) - if mappable_path_arguments - mappable_path_arguments.each do |argument_name, path_to_value| + mappable_path_arguments&.each do |argument_name, path_to_value| arguments.merge!("#{argument_name}": mappable.send(path_to_value)) - end end end diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 24d6631a8..3661af408 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -199,8 +199,8 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na find("#tab-documents-label").click expect(page).to have_content "empty.pdf" - #Review - #Doble check why the file is stored with a name different to empty.pdf + # Review + # Doble check why the file is stored with a name different to empty.pdf expect(page).to have_css("a[href$='.pdf']") end diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb index 1eef9a269..947887afa 100644 --- a/spec/shared/features/nested_imageable.rb +++ b/spec/shared/features/nested_imageable.rb @@ -1,4 +1,4 @@ -shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images=false| +shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images = false| include ActionView::Helpers include ImagesHelper include ImageablesHelper @@ -9,15 +9,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p let!(:imageable) { create(imageable_factory_name) } before do - if imageable_path_arguments - imageable_path_arguments.each do |argument_name, path_to_value| + imageable_path_arguments&.each do |argument_name, path_to_value| arguments.merge!("#{argument_name}": imageable.send(path_to_value)) - end end - if imageable.respond_to?(:author) - imageable.update(author: user) - end + imageable.update(author: user) if imageable.respond_to?(:author) end describe "at #{path}" do @@ -119,7 +115,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p click_on submit_button if has_many_images - #Pending. Review soon and test + # Pending. Review soon and test else within "#nested-image .image" do expect(page).to have_content("can't be blank", count: 2) @@ -174,7 +170,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p imageable_redirected_to_resource_show_or_navigate_to if has_many_images - #Pending. Review soon and test + # Pending. Review soon and test else expect(page).to have_selector "figure img" expect(page).to have_selector "figure figcaption" @@ -230,7 +226,7 @@ rescue return end -def imageable_attach_new_file(imageable_factory_name, path, success = true) +def imageable_attach_new_file(_imageable_factory_name, path, success = true) click_link "Add image" within "#nested-image" do image = find(".image") diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 256b070e4..b87a54d8e 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -163,14 +163,15 @@ module CommonActions expect(page).to have_content 'Document verified with Census' end - def confirm_phone + def confirm_phone(user = nil) + user ||= User.last + fill_in 'sms_phone', with: "611111111" click_button 'Send' expect(page).to have_content 'Enter the confirmation code sent to you by text message' - user = User.last.reload - fill_in 'sms_confirmation_code', with: user.sms_confirmation_code + fill_in 'sms_confirmation_code', with: user.reload.sms_confirmation_code click_button 'Send' expect(page).to have_content 'Code correct'