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

Fix removing an option for legislation questions

Browse Source 
We were allowing the `_destroy` field for translations, but not for the
options themselves.
This commit is contained in:
Javi Martín
2018-10-15 17:01:19 +02:00
parent 6952c9c9db
commit f1ccdb87b1
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/legislation/questions_controller.rb
View File

@@ -47,7 +47,9 @@ class Admin::Legislation::QuestionsController < Admin::Legislation::BaseControll
def question_params
params.require(:legislation_question).permit(
translation_params(::Legislation::Question),
question_options_attributes: [:id, translation_params(::Legislation::QuestionOption)])
question_options_attributes: [:id, :_destroy,
translation_params(::Legislation::QuestionOption)]
)
end
def resource

33
spec/features/admin/legislation/questions_spec.rb
View File

@@ -120,12 +120,14 @@ feature 'Admin legislation questions' do
edit_admin_legislation_process_question_path(question.process, question)
end
let(:field_en) { field_for(:en) }
let(:field_es) { field_for(:es) }
let(:field_en) { fields_for(:en).first }
let(:field_es) { fields_for(:es).first }
def field_for(locale)
within(page.all(".translatable_fields[data-locale='#{locale}']").last) do
page.first("[id^='legislation_question_question_option'][id$='value']")
def fields_for(locale)
within("#nested-question-options") do
page.all(
"[data-locale='#{locale}'] [id^='legislation_question_question_option'][id$='value']"
)
end
end
@@ -142,6 +144,27 @@ feature 'Admin legislation questions' do
expect(page).to have_field(field_en[:id], with: "Changed")
end
scenario "Remove an option", :js do
create(:legislation_question_option, question: question, value: "Yes")
create(:legislation_question_option, question: question, value: "No")
visit edit_question_url
expect(page).to have_field fields_for(:en).first[:id], with: "Yes"
expect(page).to have_field fields_for(:en).last[:id], with: "No"
page.first(:link, "Remove option").click
expect(page).not_to have_field fields_for(:en).first[:id], with: "Yes"
expect(page).to have_field fields_for(:en).last[:id], with: "No"
click_button "Save changes"
visit edit_question_url
expect(page).not_to have_field fields_for(:en).first[:id], with: "Yes"
expect(page).to have_field fields_for(:en).last[:id], with: "No"
end
context "Special translation behaviour" do
before do
question.update_attributes(title_en: "Title in English", title_es: "Título en Español")