consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds missing validation to poll::question. Fixes specs

Browse Source
This commit is contained in:
kikito
2017-01-25 10:46:57 +01:00
parent 25930563e9
commit 2be88cb316
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/poll/questions_controller.rb
View File

@@ -54,7 +54,7 @@ class Admin::Poll::QuestionsController < Admin::BaseController
private private
def question_params def question_params
params.require(:poll_question).permit(:title, :question, :summary, :description, :proposal_id, :valid_answers) params.require(:poll_question).permit(:poll_id, :title, :question, :summary, :description, :proposal_id, :valid_answers)
end end
def search_params def search_params

1
app/models/poll/question.rb
View File

@@ -13,6 +13,7 @@ class Poll::Question < ActiveRecord::Base
has_many :partial_results has_many :partial_results
belongs_to :proposal belongs_to :proposal
validates :poll_id, presence: true
validates :title, presence: true validates :title, presence: true
validates :summary, presence: true validates :summary, presence: true
validates :author, presence: true validates :author, presence: true

5
spec/features/admin/poll/questions_spec.rb
View File

@@ -31,6 +31,7 @@ feature 'Admin poll questions' do
end end
scenario 'Create' do scenario 'Create' do
poll = create(:poll, name: 'Movies')
title = "Star Wars: Episode IV - A New Hope" 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" 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 = %{ description = %{
@@ -41,6 +42,7 @@ feature 'Admin poll questions' do
visit admin_questions_path visit admin_questions_path
click_link "Create question" click_link "Create question"
select 'Movies', from: 'poll_question_poll_id'
fill_in 'poll_question_title', with: title fill_in 'poll_question_title', with: title
fill_in 'poll_question_summary', with: summary fill_in 'poll_question_summary', with: summary
fill_in 'poll_question_description', with: description fill_in 'poll_question_description', with: description
@@ -53,6 +55,7 @@ feature 'Admin poll questions' do
end end
scenario 'Create from successful proposal index' do scenario 'Create from successful proposal index' do
poll = create(:poll, name: 'Proposals')
proposal = create(:proposal, :successful) proposal = create(:proposal, :successful)
visit proposals_path visit proposals_path
@@ -64,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_description', with: proposal.description)
expect(page).to have_field('poll_question_valid_answers', with: "Yes, No") expect(page).to have_field('poll_question_valid_answers', with: "Yes, No")
select 'Proposals', from: 'poll_question_poll_id'
click_button 'Save' click_button 'Save'
expect(page).to have_content(proposal.title) expect(page).to have_content(proposal.title)