diff options
author | unarist <m.unarist@gmail.com> | 2017-06-12 17:58:03 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-12 10:58:03 +0200 |
commit | abbdacedc52d4c7ea0b37e16dd9761bebe02a0f6 (patch) | |
tree | 3425574755e5bb5655880e316b8793e2c51cdde9 | |
parent | ddd32519126b95742fb95b432e846b5b44457207 (diff) |
Fix locale related specs (#3707)
* Use I18n.locale instead of ":en" * Reset I18n.locale value after locale changing tests
-rw-r--r-- | spec/controllers/concerns/localized_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/home_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/localization_spec.rb | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb index 18fe508e4..c917ce85e 100644 --- a/spec/controllers/concerns/localized_spec.rb +++ b/spec/controllers/concerns/localized_spec.rb @@ -19,6 +19,7 @@ describe ApplicationController, type: :controller do context 'when DEFAULT_LOCALE environment variable is set' do around do |example| ClimateControl.modify 'DEFAULT_LOCALE' => 'ca', &example.method(:run) + I18n.locale = I18n.default_locale end it 'sets language specified by ENV if preferred' do diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb index b085e179c..a3dc6f836 100644 --- a/spec/helpers/home_helper_spec.rb +++ b/spec/helpers/home_helper_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe HomeHelper, type: :helper do describe 'default_props' do it 'returns default properties according to the context' do - expect(helper.default_props).to eq locale: :en + expect(helper.default_props).to eq locale: I18n.locale end end end diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb index d1b7bdc1d..2f7a5e91e 100644 --- a/spec/requests/localization_spec.rb +++ b/spec/requests/localization_spec.rb @@ -3,6 +3,10 @@ require 'rails_helper' describe 'Localization' do + after(:all) do + I18n.locale = I18n.default_locale + end + it 'uses a specific region when provided' do headers = { 'Accept-Language' => 'zh-HK' } |