summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-10-18 12:37:11 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-10-18 12:37:11 +0000
commit4733570c3d710f3124718fa1173f3068eb932281 (patch)
treef4f61707a9b0b42912ad54c62f9880bc6fc1868c /spec/helpers
parent852f6f79f26faa0e9c19599de6d7d9a795472b49 (diff)
parent939469cda3aa66e5cc68b6780f6ee8a8d6152d0f (diff)
downloadgitlab-ce-4733570c3d710f3124718fa1173f3068eb932281.tar.gz
Merge branch 'bvl-fix-locale-path' into 'master'
Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/application_helper_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 87ae1fa5660..66785cf32da 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -309,4 +309,12 @@ describe ApplicationHelper do
end
end
end
+
+ 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')
+ end
+ end
end