diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 18:09:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 18:09:07 +0300 |
commit | 07f3c9525c1df3ae1da995ea4fe6dd66bb61b9fd (patch) | |
tree | c44dcf94b5f26a02945720ffbd10364ad5bdbeb6 /spec/helpers | |
parent | 963e09aecfb3cdd57babdd9b37c15e34601fdb42 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/preferences_helper_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb index 9d1564dfef1..0bd8792ae83 100644 --- a/spec/helpers/preferences_helper_spec.rb +++ b/spec/helpers/preferences_helper_spec.rb @@ -71,6 +71,16 @@ RSpec.describe PreferencesHelper do end end + describe '#time_display_format_choices_with_default' do + it 'returns choices' do + expect(helper.time_display_format_choices).to eq({ + "12-hour: 2:34 PM" => 1, + "24-hour: 14:34" => 2, + "System" => 0 + }) + end + end + describe '#user_application_theme' do context 'with a user' do it "returns user's theme's css_class" do |