summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-18 16:37:16 +0000
committerRémy Coutable <remy@rymai.me>2017-10-18 16:37:16 +0000
commit9c71fb0de2f0a7482b1a59c673142981ecdab26f (patch)
treeac346227beabc14973ad3df17618763d1b8d9ce0
parentfee7a879e2f3b1347da75eb64c4f5a24fea2625f (diff)
parent0139b318f1419bf5266ed68ded04415361ead4eb (diff)
downloadgitlab-ce-9c71fb0de2f0a7482b1a59c673142981ecdab26f.tar.gz
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
-rw-r--r--spec/helpers/application_helper_spec.rb6
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