Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display language name or language key #2949

Merged
merged 7 commits into from
Oct 10, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix portuguese specs
  • Loading branch information
voodoorai2000 committed Oct 9, 2018
commit 6f978b9f4ed253d28de59114e43c18516c26fd77
20 changes: 10 additions & 10 deletions spec/features/site_customization/custom_pages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

scenario "Listed in more information page" do
custom_page = create(:site_customization_page, :published,
slug: "another-slug",
slug: "another-slug",
title_en: "Another custom page",
subtitle_en: "Subtitle for custom page",
more_info_flag: true
Expand Down Expand Up @@ -136,10 +136,10 @@
expect(page).to have_content("Subtitle for custom page")
end
end
end
end

context "Translation" do

let(:custom_page) { create(:site_customization_page, :published,
slug: "example-page",
title_en: "Title in English",
Expand All @@ -148,7 +148,7 @@
subtitle_es: "Subtitulo en Español",
content_en: "Content in English",
content_es: "Contenido en Español"
) }
) }

background do
admin = create(:administrator)
Expand All @@ -162,19 +162,19 @@
scenario "Add a translation in Português", :js do
visit @edit_page_url

select "Português", from: "translation_locale"
select "Português brasileiro", from: "translation_locale"
fill_in 'site_customization_page_title_pt_br', with: 'Titulo em Português'

click_button 'Update Custom page'
expect(page).to have_content "Page updated successfully"

visit @edit_page_url
expect(page).to have_field('site_customization_page_title_en', with: 'Title in English')

click_link "Español"
expect(page).to have_field('site_customization_page_title_es', with: 'Titulo en Español')

click_link "Português"
click_link "Português brasileiro"
expect(page).to have_field('site_customization_page_title_pt_br', with: 'Titulo em Português')
end

Expand All @@ -190,11 +190,11 @@
visit custom_page.url

select('English', from: 'locale-switcher')

expect(page).to have_content("Title in English")

select('Español', from: 'locale-switcher')

expect(page).to have_content("Titulo correcta en Español")
end

Expand Down
4 changes: 2 additions & 2 deletions spec/features/translations/poll_question_answers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@
scenario "Add a translation for a locale with non-underscored name", :js do
visit @edit_answer_url

select('Português', from: 'translation_locale')
select('Português brasileiro', 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')
select('Português brasileiro', from: 'locale-switcher')
expect(page).to have_content("resposta em Português")
end

Expand Down
4 changes: 2 additions & 2 deletions spec/shared/features/translatable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@
visit path
field = fields.sample

select "Português", from: "translation_locale"
select "Português brasileiro", from: "translation_locale"
fill_in field_for(field, :pt_br), with: text_for(field, :"pt-BR")

click_button update_button_text

visit path

select('Português', from: 'locale-switcher')
select('Português brasileiro', from: 'locale-switcher')

expect(page).to have_field(field_for(field, :pt_br), with: text_for(field, :"pt-BR"))
end
Expand Down