logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: abbdacedc52d4c7ea0b37e16dd9761bebe02a0f6
parent: ddd32519126b95742fb95b432e846b5b44457207
Author: unarist <m.unarist@gmail.com>
Date:   Mon, 12 Jun 2017 17:58:03 +0900

Fix locale related specs (#3707)

* Use I18n.locale instead of ":en"
* Reset I18n.locale value after locale changing tests

Diffstat:

Mspec/controllers/concerns/localized_spec.rb1+
Mspec/helpers/home_helper_spec.rb2+-
Mspec/requests/localization_spec.rb4++++
3 files changed, 6 insertions(+), 1 deletion(-)

diff --git 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 @@ -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 @@ -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' }