From 8672124f3146d4cbb655a2ecd6562642d714fb00 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 26 Feb 2020 11:23:45 +0100 Subject: [PATCH] Add 'pt' to list of available locales in test suite Fixes several errors such as: 104) UserRegistrationsController via ajax sets user.locale from cookie on create Failure/Error: I18n.locale = spree_current_user.andand.locale || cookies[:locale] || I18n.default_locale I18n::InvalidLocale: "pt" is not a valid locale # ./app/helpers/i18n_helper.rb:14:in `set_locale' # ./spec/controllers/user_registrations_controller_spec.rb:56:in `block (3 levels) in ' --- config/environments/test.rb | 2 +- spec/features/admin/multilingual_spec.rb | 4 ++-- spec/features/consumer/multilingual_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index bb1da68229..f33423acdd 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -35,7 +35,7 @@ Openfoodnetwork::Application.configure do # Tests assume English text on the site. config.i18n.default_locale = "en" - config.i18n.available_locales = ['en', 'es'] + config.i18n.available_locales = ['en', 'es', 'pt'] config.i18n.fallbacks = [:en] I18n.locale = config.i18n.locale = config.i18n.default_locale diff --git a/spec/features/admin/multilingual_spec.rb b/spec/features/admin/multilingual_spec.rb index ee9d44e195..90d21d1ecd 100644 --- a/spec/features/admin/multilingual_spec.rb +++ b/spec/features/admin/multilingual_spec.rb @@ -12,10 +12,10 @@ feature 'Multilingual', js: true do visit spree.admin_dashboard_path end - it 'has two locales available' do + it 'has three locales available' do expect(Rails.application.config.i18n[:default_locale]).to eq 'en' expect(Rails.application.config.i18n[:locale]).to eq 'en' - expect(Rails.application.config.i18n[:available_locales]).to eq ['en', 'es'] + expect(Rails.application.config.i18n[:available_locales]).to eq ['en', 'es', 'pt'] end it 'can switch language by params' do diff --git a/spec/features/consumer/multilingual_spec.rb b/spec/features/consumer/multilingual_spec.rb index 4bf209361c..3e8a19f4d0 100644 --- a/spec/features/consumer/multilingual_spec.rb +++ b/spec/features/consumer/multilingual_spec.rb @@ -7,10 +7,10 @@ feature 'Multilingual', js: true do include UIComponentHelper include CookieHelper - it 'has two locales available' do + it 'has three locales available' do expect(Rails.application.config.i18n[:default_locale]).to eq 'en' expect(Rails.application.config.i18n[:locale]).to eq 'en' - expect(Rails.application.config.i18n[:available_locales]).to eq ['en', 'es'] + expect(Rails.application.config.i18n[:available_locales]).to eq ['en', 'es', 'pt'] end it '18n-js fallsback to default language' do # in backend it doesn't until we change enforce_available_locales to `true`