#{Faker::Lorem.paragraphs.join('
')}
" - Poll::Question::Answer.create!(question: question, - title: answer.capitalize, - description: description) + answer = Poll::Question::Answer.new(question: question, + title: title.capitalize, + description: description) + I18n.available_locales.map do |locale| + Globalize.with_locale(locale) do + answer.title = "#{title} (#{locale})" + answer.description = "#{description} (#{locale})" + end + end + answer.save! end end end @@ -174,12 +201,26 @@ section "Creating Poll Questions from Proposals" do proposal = Proposal.all.sample poll = Poll.current.first 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) + Faker::Lorem.words((2..4).to_a.sample).each do |title| + description = "#{Faker::ChuckNorris.fact}
" + answer = Poll::Question::Answer.new(question: question, + title: title.capitalize, + description: description) + I18n.available_locales.map do |locale| + Globalize.with_locale(locale) do + answer.title = "#{title} (#{locale})" + answer.description = "#{description} (#{locale})" + end + end + answer.save! end question.copy_attributes_from_proposal(proposal) + title = question.title + I18n.available_locales.map do |locale| + Globalize.with_locale(locale) do + question.title = "#{title} (#{locale})" + end + end question.save! end end @@ -189,12 +230,26 @@ section "Creating Successful Proposals" do proposal = Proposal.all.sample poll = Poll.current.first 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) + Faker::Lorem.words((2..4).to_a.sample).each do |title| + description = "#{Faker::ChuckNorris.fact}
" + answer = Poll::Question::Answer.new(question: question, + title: title.capitalize, + description: description) + I18n.available_locales.map do |locale| + Globalize.with_locale(locale) do + answer.title = "#{title} (#{locale})" + answer.description = "#{description} (#{locale})" + end + end + answer.save! end question.copy_attributes_from_proposal(proposal) + title = question.title + I18n.available_locales.map do |locale| + Globalize.with_locale(locale) do + question.title = "#{title} (#{locale})" + end + end question.save! end end diff --git a/db/migrate/20180730213824_add_poll_translations.rb b/db/migrate/20180730213824_add_poll_translations.rb new file mode 100644 index 000000000..4a4fa72a4 --- /dev/null +++ b/db/migrate/20180730213824_add_poll_translations.rb @@ -0,0 +1,15 @@ +class AddPollTranslations < ActiveRecord::Migration + + def self.up + Poll.create_translation_table!( + name: :string, + summary: :text, + description: :text + ) + end + + def self.down + Poll.drop_translation_table! + end + +end diff --git a/db/migrate/20180731173147_add_poll_question_translations.rb b/db/migrate/20180731173147_add_poll_question_translations.rb new file mode 100644 index 000000000..a167ea00a --- /dev/null +++ b/db/migrate/20180731173147_add_poll_question_translations.rb @@ -0,0 +1,13 @@ +class AddPollQuestionTranslations < ActiveRecord::Migration + + def self.up + Poll::Question.create_translation_table!( + title: :string + ) + end + + def self.down + Poll::Question.drop_translation_table! + end + +end diff --git a/db/migrate/20180801114529_add_poll_question_answer_translations.rb b/db/migrate/20180801114529_add_poll_question_answer_translations.rb new file mode 100644 index 000000000..91643f443 --- /dev/null +++ b/db/migrate/20180801114529_add_poll_question_answer_translations.rb @@ -0,0 +1,14 @@ +class AddPollQuestionAnswerTranslations < ActiveRecord::Migration + + def self.up + Poll::Question::Answer.create_translation_table!( + title: :string, + description: :text + ) + end + + def self.down + Poll::Question::Answer.drop_translation_table! + end + +end diff --git a/db/schema.rb b/db/schema.rb index 9f3d4b22b..37bfe9912 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -880,6 +880,18 @@ ActiveRecord::Schema.define(version: 20180813141443) do add_index "poll_partial_results", ["origin"], name: "index_poll_partial_results_on_origin", using: :btree add_index "poll_partial_results", ["question_id"], name: "index_poll_partial_results_on_question_id", using: :btree + create_table "poll_question_answer_translations", force: :cascade do |t| + t.integer "poll_question_answer_id", null: false + t.string "locale", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.text "description" + end + + add_index "poll_question_answer_translations", ["locale"], name: "index_poll_question_answer_translations_on_locale", using: :btree + add_index "poll_question_answer_translations", ["poll_question_answer_id"], name: "index_85270fa85f62081a3a227186b4c95fe4f7fa94b9", using: :btree + create_table "poll_question_answer_videos", force: :cascade do |t| t.string "title" t.string "url" @@ -898,6 +910,17 @@ ActiveRecord::Schema.define(version: 20180813141443) do add_index "poll_question_answers", ["question_id"], name: "index_poll_question_answers_on_question_id", using: :btree + create_table "poll_question_translations", force: :cascade do |t| + t.integer "poll_question_id", null: false + t.string "locale", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + end + + add_index "poll_question_translations", ["locale"], name: "index_poll_question_translations_on_locale", using: :btree + add_index "poll_question_translations", ["poll_question_id"], name: "index_poll_question_translations_on_poll_question_id", using: :btree + create_table "poll_questions", force: :cascade do |t| t.integer "proposal_id" t.integer "poll_id" @@ -951,6 +974,19 @@ ActiveRecord::Schema.define(version: 20180813141443) do add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree + create_table "poll_translations", force: :cascade do |t| + t.integer "poll_id", null: false + t.string "locale", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "name" + t.text "summary" + t.text "description" + end + + add_index "poll_translations", ["locale"], name: "index_poll_translations_on_locale", using: :btree + add_index "poll_translations", ["poll_id"], name: "index_poll_translations_on_poll_id", using: :btree + create_table "poll_voters", force: :cascade do |t| t.string "document_number" t.string "document_type" diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index e7e4d6bba..b28aff019 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -7,6 +7,11 @@ feature 'Admin polls' do login_as(admin.user) end + it_behaves_like "translatable", + "poll", + "edit_admin_poll_path", + %w[name summary description] + scenario 'Index empty', :js do visit admin_root_path @@ -55,11 +60,11 @@ feature 'Admin polls' do start_date = 1.week.from_now end_date = 2.weeks.from_now - fill_in "poll_name", with: "Upcoming poll" + fill_in "poll_name_en", with: "Upcoming poll" fill_in 'poll_starts_at', with: start_date.strftime("%d/%m/%Y") fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") - fill_in 'poll_summary', with: "Upcoming poll's summary. This poll..." - fill_in 'poll_description', with: "Upcomming poll's description. This poll..." + fill_in 'poll_summary_en', with: "Upcoming poll's summary. This poll..." + fill_in 'poll_description_en', with: "Upcomming poll's description. This poll..." expect(page).not_to have_css("#poll_results_enabled") expect(page).not_to have_css("#poll_stats_enabled") @@ -83,7 +88,7 @@ feature 'Admin polls' do expect(page).to have_css("img[alt='#{poll.image.title}']") - fill_in "poll_name", with: "Next Poll" + fill_in "poll_name_en", with: "Next Poll" fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") click_button "Update poll" diff --git a/spec/features/admin/poll/questions/answers/answers_spec.rb b/spec/features/admin/poll/questions/answers/answers_spec.rb index 288f514a4..dbcf8cf5c 100644 --- a/spec/features/admin/poll/questions/answers/answers_spec.rb +++ b/spec/features/admin/poll/questions/answers/answers_spec.rb @@ -15,8 +15,8 @@ feature 'Answers' do visit admin_question_path(question) click_link 'Add answer' - fill_in 'poll_question_answer_title', with: title - fill_in 'poll_question_answer_description', with: description + fill_in 'poll_question_answer_title_en', with: title + fill_in 'poll_question_answer_description_en', with: description click_button 'Save' @@ -33,8 +33,8 @@ feature 'Answers' do visit admin_question_path(question) click_link 'Add answer' - fill_in 'poll_question_answer_title', with: title - fill_in 'poll_question_answer_description', with: description + fill_in 'poll_question_answer_title_en', with: title + fill_in 'poll_question_answer_description_en', with: description click_button 'Save' @@ -53,7 +53,7 @@ feature 'Answers' do old_title = answer.title new_title = 'Ex Machina' - fill_in 'poll_question_answer_title', with: new_title + fill_in 'poll_question_answer_title_en', with: new_title click_button 'Save' diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb index d499869b9..230ba5c28 100644 --- a/spec/features/admin/poll/questions_spec.rb +++ b/spec/features/admin/poll/questions_spec.rb @@ -6,6 +6,11 @@ feature 'Admin poll questions' do login_as(create(:administrator).user) end + it_behaves_like "translatable", + "poll_question", + "edit_admin_question_path", + %w[title] + scenario 'Index' do question1 = create(:poll_question) question2 = create(:poll_question) @@ -41,7 +46,7 @@ feature 'Admin poll questions' do click_link "Create question" select 'Movies', from: 'poll_question_poll_id' - fill_in 'poll_question_title', with: title + fill_in 'poll_question_title_en', with: title click_button 'Save' @@ -56,7 +61,7 @@ feature 'Admin poll questions' do click_link "Create question" expect(page).to have_current_path(new_admin_question_path, ignore_query: true) - expect(page).to have_field('poll_question_title', with: proposal.title) + expect(page).to have_field('poll_question_title_en', with: proposal.title) select 'Proposals', from: 'poll_question_poll_id' @@ -79,7 +84,7 @@ feature 'Admin poll questions' do old_title = question1.title new_title = "Potatoes are great and everyone should have one" - fill_in 'poll_question_title', with: new_title + fill_in 'poll_question_title_en', with: new_title click_button 'Save' @@ -108,4 +113,41 @@ feature 'Admin poll questions' do pending "Mark all city by default when creating a poll question from a successful proposal" + context "Poll select box" do + + let(:poll) { create(:poll, name_en: "Name in English", + name_es: "Nombre en Español", + summary_en: "Summary in English", + summary_es: "Resumen en Español", + description_en: "Description in English", + description_es: "Descripción en Español") } + + let(:question) { create(:poll_question, poll: poll, + title_en: "Question in English", + title_es: "Pregunta en Español") } + + before do + @edit_question_url = edit_admin_question_path(question) + end + + scenario "translates the poll name in options", :js do + visit @edit_question_url + + expect(page).to have_select('poll_question_poll_id', options: [poll.name_en]) + + select('Español', from: 'locale-switcher') + + expect(page).to have_select('poll_question_poll_id', options: [poll.name_es]) + end + + scenario "uses fallback if name is not translated to current locale", :js do + visit @edit_question_url + + expect(page).to have_select('poll_question_poll_id', options: [poll.name_en]) + + select('Français', from: 'locale-switcher') + + expect(page).to have_select('poll_question_poll_id', options: [poll.name_es]) + end + end end diff --git a/spec/features/polls/answers_spec.rb b/spec/features/polls/answers_spec.rb index 8bb87c94e..6daffc0eb 100644 --- a/spec/features/polls/answers_spec.rb +++ b/spec/features/polls/answers_spec.rb @@ -28,8 +28,8 @@ feature 'Answers' do visit admin_question_path(question) click_link "Add answer" - fill_in "poll_question_answer_title", with: "¿Would you like to reform Central Park?" - fill_in "poll_question_answer_description", with: "Adding more trees, creating a play area..." + fill_in "poll_question_answer_title_en", with: "¿Would you like to reform Central Park?" + fill_in "poll_question_answer_description_en", with: "Adding more trees, creating a play area..." click_button "Save" expect(page).to have_content "Answer created successfully" diff --git a/spec/features/translations/poll_question_answers_spec.rb b/spec/features/translations/poll_question_answers_spec.rb new file mode 100644 index 000000000..cd33106c1 --- /dev/null +++ b/spec/features/translations/poll_question_answers_spec.rb @@ -0,0 +1,149 @@ +# coding: utf-8 +require 'rails_helper' + +feature "Translations" do + + context "Polls" do + + let(:poll) { create(:poll, name_en: "Name in English", + name_es: "Nombre en Español", + summary_en: "Summary in English", + summary_es: "Resumen en Español", + description_en: "Description in English", + description_es: "Descripción en Español") } + + background do + admin = create(:administrator) + login_as(admin.user) + end + + context "Questions" do + + let(:question) { create(:poll_question, poll: poll, + title_en: "Question in English", + title_es: "Pregunta en Español") } + + context "Answers" do + + let(:answer) { create(:poll_question_answer, question: question, + title_en: "Answer in English", + title_es: "Respuesta en Español", + description_en: "Description in English", + description_es: "Descripción en Español") } + + before do + @edit_answer_url = edit_admin_answer_path(answer) + end + + scenario "Add a translation", :js do + visit @edit_answer_url + + select "Français", from: "translation_locale" + fill_in 'poll_question_answer_title_fr', with: 'Answer en Français' + fill_in_ckeditor 'poll_question_answer_description_fr', with: 'Description en Français' + + click_button 'Save' + expect(page).to have_content "Changes saved" + + expect(page).to have_content "Answer in English" + expect(page).to have_content "Description in English" + + select('Español', from: 'locale-switcher') + expect(page).to have_content "Respuesta en Español" + expect(page).to have_content "Descripción en Español" + + select('Français', from: 'locale-switcher') + expect(page).to have_content "Answer en Français" + expect(page).to have_content "Description en Français" + end + + scenario "Update a translation with allowed blank translated field", :js do + visit @edit_answer_url + + click_link "Español" + fill_in 'poll_question_answer_title_es', with: 'Pregunta correcta en Español' + fill_in_ckeditor 'poll_question_answer_description_es', with: '' + + click_button 'Save' + expect(page).to have_content "Changes saved" + + expect(page).to have_content("Answer in English") + expect(page).to have_content("Description in English") + + select('Español', from: 'locale-switcher') + expect(page).to have_content("Pregunta correcta en Español") + expect(page).to_not have_content("Descripción en Español") + end + + scenario "Remove a translation", :js do + visit @edit_answer_url + + click_link "Español" + click_link "Remove language" + + expect(page).not_to have_link "Español" + + click_button "Save" + visit @edit_answer_url + expect(page).not_to have_link "Español" + end + + scenario "Add a translation for a locale with non-underscored name", :js do + visit @edit_answer_url + + select('Português', from: 'translation_locale') + fill_in_ckeditor 'poll_question_answer_description_pt_br', with: 'resposta em Português' + click_button 'Save' + + select('Português', from: 'locale-switcher') + expect(page).to have_content("resposta em Português") + end + + context "Globalize javascript interface" do + + scenario "Highlight current locale", :js do + visit @edit_answer_url + + expect(find("a.js-globalize-locale-link.is-active")).to have_content "English" + + select('Español', from: 'locale-switcher') + + expect(find("a.js-globalize-locale-link.is-active")).to have_content "Español" + end + + scenario "Highlight selected locale", :js do + visit @edit_answer_url + + expect(find("a.js-globalize-locale-link.is-active")).to have_content "English" + + click_link "Español" + + expect(find("a.js-globalize-locale-link.is-active")).to have_content "Español" + end + + scenario "Show selected locale form", :js do + visit @edit_answer_url + + expect(page).to have_field('poll_question_answer_title_en', with: 'Answer in English') + + click_link "Español" + + expect(page).to have_field('poll_question_answer_title_es', with: 'Respuesta en Español') + end + + scenario "Select a locale and add it to the poll form", :js do + visit @edit_answer_url + + select "Français", from: "translation_locale" + + expect(page).to have_link "Français" + + click_link "Français" + + expect(page).to have_field('poll_question_answer_title_fr') + end + end + end + end + end +end diff --git a/spec/shared/features/translatable.rb b/spec/shared/features/translatable.rb index c9bc5fd45..a8b86cc75 100644 --- a/spec/shared/features/translatable.rb +++ b/spec/shared/features/translatable.rb @@ -188,6 +188,10 @@ def update_button_text "Update milestone" when "AdminNotification" "Update notification" + when "Poll" + "Update poll" + when "Poll::Question" + "Save" else "Save changes" end