+ (<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>) -
+ +<% if @poll.geozone_restricted %> + • + + <%= @poll.geozones.pluck(:name).to_sentence %> + +<% end %>
- <%= t("admin.questions.show.geozones") %>
-
- <% @question.geozones.each do |geozone| %>
-
- <%= geozone.name %>
-
- <% end %>
-
<%= @question.summary %>
- -#{Faker::Lorem.paragraphs.join('
')}
" @@ -496,14 +501,12 @@ puts "Creating Poll Questions" summary: Faker::Lorem.sentence(3), description: description, valid_answers: Faker::Lorem.words(3).join(', '), - poll: poll, - geozones: Geozone.reorder("RANDOM()").limit(3), - all_geozones: [true, false].sample) + poll: poll) puts " #{question.title}" end puts "Creating Poll Booths" -10.times.each_with_index do |i| +30.times.each_with_index do |i| Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample]) end @@ -515,7 +518,7 @@ end puts "Creating Poll Officer Assignments" (1..10).to_a.sample.times do |i| Poll::BoothAssignment.all.sample(i).each do |booth_assignment| - Poll::OfficerAssignment.create(officer: poll_officer, + Poll::OfficerAssignment.create(officer: poll_officer.poll_officer, booth_assignment: booth_assignment, date: booth_assignment.poll.starts_at) end @@ -523,7 +526,7 @@ end puts "Creating Poll Question from Proposals" -(1..3).each do |i| +(1..3).each do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first question = Poll::Question.create(valid_answers: "Yes, No") @@ -535,7 +538,7 @@ end puts "Creating Successful Proposals" -(1..10).each do |i| +(1..10).each do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first question = Poll::Question.create(valid_answers: "Yes, No") @@ -547,11 +550,11 @@ end puts "Commenting Poll Questions" -(1..30).each do |i| +(1..30).each do author = User.reorder("RANDOM()").first question = Poll::Question.reorder("RANDOM()").first Comment.create!(user: author, created_at: rand(question.created_at .. Time.current), commentable: question, body: Faker::Lorem.sentence) -end \ No newline at end of file +end diff --git a/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb new file mode 100644 index 000000000..a2606c370 --- /dev/null +++ b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb @@ -0,0 +1,10 @@ +class MoveGeozonesFromPollQuestionsToPolls < ActiveRecord::Migration + def change + drop_table :geozones_poll_questions + + create_table :geozones_polls do |t| + t.references :geozone, index: true, foreign_key: true + t.references :poll, index: true, foreign_key: true + end + end +end diff --git a/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb b/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb new file mode 100644 index 000000000..d6ed3a2c7 --- /dev/null +++ b/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb @@ -0,0 +1,5 @@ +class AddGeozoneRestrictedToPolls < ActiveRecord::Migration + def change + add_column :polls, :geozone_restricted, :boolean, default: false, index: true + end +end diff --git a/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb b/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb new file mode 100644 index 000000000..b4fcecd20 --- /dev/null +++ b/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb @@ -0,0 +1,5 @@ +class RemoveAllGeozonesFromPollQuestions < ActiveRecord::Migration + def change + remove_column :poll_questions, :all_geozones, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 5385ef19b..8eb3c5ce3 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: 20170114154421) do +ActiveRecord::Schema.define(version: 20170120164547) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -307,13 +307,13 @@ ActiveRecord::Schema.define(version: 20170114154421) do t.string "census_code" end - create_table "geozones_poll_questions", force: :cascade do |t| + create_table "geozones_polls", force: :cascade do |t| t.integer "geozone_id" - t.integer "question_id" + t.integer "poll_id" end - add_index "geozones_poll_questions", ["geozone_id"], name: "index_geozones_poll_questions_on_geozone_id", using: :btree - add_index "geozones_poll_questions", ["question_id"], name: "index_geozones_poll_questions_on_question_id", using: :btree + add_index "geozones_polls", ["geozone_id"], name: "index_geozones_polls_on_geozone_id", using: :btree + add_index "geozones_polls", ["poll_id"], name: "index_geozones_polls_on_poll_id", using: :btree create_table "identities", force: :cascade do |t| t.integer "user_id" @@ -424,7 +424,6 @@ ActiveRecord::Schema.define(version: 20170114154421) do t.datetime "hidden_at" t.datetime "created_at" t.datetime "updated_at" - t.boolean "all_geozones", default: false t.tsvector "tsv" end @@ -459,7 +458,8 @@ ActiveRecord::Schema.define(version: 20170114154421) do t.string "name" t.datetime "starts_at" t.datetime "ends_at" - t.boolean "published", default: false + t.boolean "published", default: false + t.boolean "geozone_restricted", default: false end create_table "proposal_notifications", force: :cascade do |t| @@ -768,8 +768,8 @@ ActiveRecord::Schema.define(version: 20170114154421) do add_foreign_key "annotations", "users" add_foreign_key "failed_census_calls", "users" add_foreign_key "flags", "users" - add_foreign_key "geozones_poll_questions", "geozones" - add_foreign_key "geozones_poll_questions", "poll_questions", column: "question_id" + add_foreign_key "geozones_polls", "geozones" + add_foreign_key "geozones_polls", "polls" add_foreign_key "identities", "users" add_foreign_key "locks", "users" add_foreign_key "managers", "users" diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb index 90e55107c..de26889d6 100644 --- a/spec/features/admin/poll/questions_spec.rb +++ b/spec/features/admin/poll/questions_spec.rb @@ -18,7 +18,8 @@ feature 'Admin poll questions' do scenario 'Show' do geozone = create(:geozone) - question = create(:poll_question, geozone_ids: geozone.id) + poll = create(:poll, geozone_restricted: true, geozone_ids: [geozone.id]) + question = create(:poll_question, poll: poll) visit admin_question_path(question) @@ -27,10 +28,10 @@ feature 'Admin poll questions' do expect(page).to have_content(question.summary) expect(page).to have_content(question.author.name) expect(page).to have_content(question.valid_answers.join(" ")) - expect(page).to have_content(geozone.name) end scenario 'Create' do + poll = create(:poll, name: 'Movies') title = "Star Wars: Episode IV - A New Hope" summary = "It is a period of civil war. Rebel spaceships, striking from a hidden base, have won their first victory against the evil Galactic Empire" description = %{ @@ -41,6 +42,7 @@ feature 'Admin poll questions' do visit admin_questions_path click_link "Create question" + select 'Movies', from: 'poll_question_poll_id' fill_in 'poll_question_title', with: title fill_in 'poll_question_summary', with: summary fill_in 'poll_question_description', with: description @@ -53,7 +55,7 @@ feature 'Admin poll questions' do end scenario 'Create from successful proposal index' do - geozones = create_list(:geozone, 3) + poll = create(:poll, name: 'Proposals') proposal = create(:proposal, :successful) visit proposals_path @@ -65,6 +67,8 @@ feature 'Admin poll questions' do expect(page).to have_field('poll_question_description', with: proposal.description) expect(page).to have_field('poll_question_valid_answers', with: "Yes, No") + select 'Proposals', from: 'poll_question_poll_id' + click_button 'Save' expect(page).to have_content(proposal.title) @@ -115,4 +119,4 @@ feature 'Admin poll questions' do pending "Mark all city by default when creating a poll question from a successful proposal" -end \ No newline at end of file +end diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index df8ee5105..c4a8f55a2 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -82,7 +82,9 @@ feature 'Polls' do end scenario 'Level 1 users' do - create(:poll_question, poll: poll, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + poll.update(geozone_restricted: true) + poll.geozones << geozone + create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') login_as(create(:user, geozone: geozone)) visit poll_path(poll) @@ -96,8 +98,9 @@ feature 'Polls' do end scenario 'Level 2 users in an incoming poll' do - incoming_poll = create(:poll, :incoming) - create(:poll_question, poll: incoming_poll, geozone_ids: [geozone.id], valid_answers: 'Rey, Finn') + incoming_poll = create(:poll, :incoming, geozone_restricted: true) + incoming_poll.geozones << geozone + create(:poll_question, poll: incoming_poll, valid_answers: 'Rey, Finn') login_as(create(:user, :level_two, geozone: geozone)) visit poll_path(incoming_poll) @@ -111,8 +114,9 @@ feature 'Polls' do end scenario 'Level 2 users in an expired poll' do - expired_poll = create(:poll, :expired) - create(:poll_question, poll: expired_poll, geozone_ids: [geozone.id], valid_answers: 'Luke, Leia') + expired_poll = create(:poll, :expired, geozone_restricted: true) + expired_poll.geozones << geozone + create(:poll_question, poll: expired_poll, valid_answers: 'Luke, Leia') login_as(create(:user, :level_two, geozone: geozone)) visit poll_path(expired_poll) @@ -126,21 +130,23 @@ feature 'Polls' do end scenario 'Level 2 users in a poll with questions for a geozone which is not theirs' do - create(:poll_question, poll: poll, geozone_ids: [], valid_answers: 'Vader, Palpatine') + poll.update(geozone_restricted: true) + poll.geozones << create(:geozone) + create(:poll_question, poll: poll, valid_answers: 'Vader, Palpatine') login_as(create(:user, :level_two)) visit poll_path(poll) - expect(page).to have_content("You can't answers the following 1 questions because are not available in your geozone.") - expect(page).to have_content('Vader') expect(page).to have_content('Palpatine') expect(page).to_not have_link('Vader') expect(page).to_not have_link('Palpatine') end - scenario 'Level 2 users reading a same-geozone question' do - create(:poll_question, poll: poll, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + scenario 'Level 2 users reading a same-geozone poll' do + poll.update(geozone_restricted: true) + poll.geozones << geozone + create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') login_as(create(:user, :level_two, geozone: geozone)) visit poll_path(poll) @@ -148,9 +154,9 @@ feature 'Polls' do expect(page).to have_link('Chewbacca') end - scenario 'Level 2 users reading a all-geozones question' do - create(:poll_question, poll: poll, all_geozones: true, valid_answers: 'Han Solo, Chewbacca') - login_as(create(:user, :level_two, geozone: geozone)) + scenario 'Level 2 users reading a all-geozones poll' do + create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') + login_as(create(:user, :level_two)) visit poll_path(poll) expect(page).to have_link('Han Solo') @@ -158,8 +164,8 @@ feature 'Polls' do end scenario 'Level 2 users who have already answered' do - question = create(:poll_question, poll: poll, geozone_ids:[geozone.id], valid_answers: 'Han Solo, Chewbacca') - user = create(:user, :level_two, geozone: geozone) + question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') + user = create(:user, :level_two) create(:poll_partial_result, question: question, author: user, answer: 'Chewbacca') login_as user @@ -171,7 +177,9 @@ feature 'Polls' do end scenario 'Level 2 users answering', :js do - create(:poll_question, poll: poll, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + 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) @@ -183,4 +191,4 @@ feature 'Polls' do end end -end \ No newline at end of file +end diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb index 8e6574c5f..af4c1058c 100644 --- a/spec/features/polls/questions_spec.rb +++ b/spec/features/polls/questions_spec.rb @@ -14,7 +14,7 @@ feature 'Poll Questions' do context 'Answering' do let(:geozone) { create(:geozone) } - + let(:poll) { create(:poll, geozone_restricted: true, geozone_ids: [geozone.id]) } scenario 'Non-logged in users' do question = create(:poll_question, valid_answers: 'Han Solo, Chewbacca') @@ -29,7 +29,7 @@ feature 'Poll Questions' do end scenario 'Level 1 users' do - question = create(:poll_question, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') login_as(create(:user, geozone: geozone)) visit question_path(question) @@ -43,9 +43,11 @@ feature 'Poll Questions' do end scenario 'Level 2 users in an poll question for a geozone which is not theirs' do - question = create(:poll_question, geozone_ids: [], valid_answers: 'Vader, Palpatine') - login_as(create(:user, :level_two)) + other_poll = create(:poll, geozone_restricted: true, geozone_ids: [create(:geozone).id]) + question = create(:poll_question, poll: other_poll, valid_answers: 'Vader, Palpatine') + + login_as(create(:user, :level_two, geozone: geozone)) visit question_path(question) expect(page).to have_content('Vader') @@ -55,7 +57,7 @@ feature 'Poll Questions' do end scenario 'Level 2 users who can answer' do - question = create(:poll_question, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') login_as(create(:user, :level_two, geozone: geozone)) visit question_path(question) @@ -65,7 +67,7 @@ feature 'Poll Questions' do end scenario 'Level 2 users who have already answered' do - question = create(:poll_question, geozone_ids:[geozone.id], valid_answers: 'Han Solo, Chewbacca') + question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') user = create(:user, :level_two, geozone: geozone) create(:poll_partial_result, question: question, author: user, answer: 'Chewbacca') @@ -79,7 +81,7 @@ feature 'Poll Questions' do end scenario 'Level 2 users answering', :js do - question = create(:poll_question, geozone_ids: [geozone.id], valid_answers: 'Han Solo, Chewbacca') + question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') user = create(:user, :level_two, geozone: geozone) login_as user @@ -92,4 +94,4 @@ feature 'Poll Questions' do end end -end \ No newline at end of file +end diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb index ff4fd315e..d1eddcd51 100644 --- a/spec/models/abilities/common_spec.rb +++ b/spec/models/abilities/common_spec.rb @@ -27,19 +27,26 @@ describe "Abilities::Common" do let(:current_poll) { create(:poll) } let(:incoming_poll) { create(:poll, :incoming) } + let(:incoming_poll_from_own_geozone) { create(:poll, :incoming, geozone_restricted: true, geozones: [geozone]) } + let(:incoming_poll_from_other_geozone) { create(:poll, :incoming, geozone_restricted: true, geozones: [create(:geozone)]) } let(:expired_poll) { create(:poll, :expired) } + let(:expired_poll_from_own_geozone) { create(:poll, :expired, geozone_restricted: true, geozones: [geozone]) } + let(:expired_poll_from_other_geozone) { create(:poll, :expired, geozone_restricted: true, geozones: [create(:geozone)]) } + let(:poll) { create(:poll, geozone_restricted: false) } + let(:poll_from_own_geozone) { create(:poll, geozone_restricted: true, geozones: [geozone]) } + let(:poll_from_other_geozone) { create(:poll, geozone_restricted: true, geozones: [create(:geozone)]) } - let(:poll_question_from_own_geozone) { create(:poll_question, geozones: [geozone]) } - let(:poll_question_from_other_geozone) { create(:poll_question, geozones: [create(:geozone)]) } - let(:poll_question_from_all_geozones) { create(:poll_question, all_geozones: true) } + let(:poll_question_from_own_geozone) { create(:poll_question, poll: poll_from_own_geozone) } + let(:poll_question_from_other_geozone) { create(:poll_question, poll: poll_from_other_geozone) } + let(:poll_question_from_all_geozones) { create(:poll_question, poll: poll) } - let(:expired_poll_question_from_own_geozone) { create(:poll_question, poll: expired_poll, geozones: [geozone]) } - let(:expired_poll_question_from_other_geozone) { create(:poll_question, poll: expired_poll, geozones: [create(:geozone)]) } - let(:expired_poll_question_from_all_geozones) { create(:poll_question, poll: expired_poll, all_geozones: true) } + let(:expired_poll_question_from_own_geozone) { create(:poll_question, poll: expired_poll_from_own_geozone) } + let(:expired_poll_question_from_other_geozone) { create(:poll_question, poll: expired_poll_from_other_geozone) } + let(:expired_poll_question_from_all_geozones) { create(:poll_question, poll: expired_poll) } - let(:incoming_poll_question_from_own_geozone) { create(:poll_question, poll: incoming_poll, geozones: [geozone]) } - let(:incoming_poll_question_from_other_geozone) { create(:poll_question, poll: incoming_poll, geozones: [create(:geozone)]) } - let(:incoming_poll_question_from_all_geozones) { create(:poll_question, poll: incoming_poll, all_geozones: true) } + let(:incoming_poll_question_from_own_geozone) { create(:poll_question, poll: incoming_poll_from_own_geozone) } + let(:incoming_poll_question_from_other_geozone) { create(:poll_question, poll: incoming_poll_from_other_geozone) } + let(:incoming_poll_question_from_all_geozones) { create(:poll_question, poll: incoming_poll) } it { should be_able_to(:index, Debate) } it { should be_able_to(:show, debate) } diff --git a/spec/models/poll/question_spec.rb b/spec/models/poll/question_spec.rb index fa572467a..057dfebca 100644 --- a/spec/models/poll/question_spec.rb +++ b/spec/models/poll/question_spec.rb @@ -20,7 +20,6 @@ RSpec.describe Poll::Question, type: :model do expect(q.author_visible_name).to eq(p.author.name) expect(q.proposal_id).to eq(p.id) expect(q.title).to eq(p.title) - expect(q.all_geozones).to be true end end