diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-18 19:37:16 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 20:50:27 +0300 |
| commit | 83b59da6549d3137f1424ee9bf16b95e4f72173e (patch) | |
| tree | b0bf571e885791fb3bbd85bca8f06593a2e56b2b /spec | |
| parent | 4c8cd0941380fac24642df66f0ce66929b3bfa60 (diff) | |
Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' into 'master'
Resolve "Jobs fail because of Brazilian Portuguese translations"
Closes #39253
See merge request gitlab-org/gitlab-ce!14939
(cherry picked from commit 9c71fb0de2f0a7482b1a59c673142981ecdab26f)
0139b318 Prevent ApplicationHelper specs from polluting later ones
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 66785cf32da..7a241b02d28 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -312,9 +312,9 @@ describe ApplicationHelper do describe '#locale_path' do it 'returns the locale path with an `_`' do - Gitlab::I18n.locale = 'pt-BR' - - expect(helper.locale_path).to include('assets/locale/pt_BR/app') + Gitlab::I18n.with_locale('pt-BR') do + expect(helper.locale_path).to include('assets/locale/pt_BR/app') + end end end end |