Commit 26264625 authored by Ruben Davila's avatar Ruben Davila

Small refactor after last code review.

parent 99dcf870
...@@ -41,7 +41,7 @@ module PreferencesHelper ...@@ -41,7 +41,7 @@ module PreferencesHelper
end end
def user_application_theme def user_application_theme
Gitlab::Themes.for_user(current_user).css_class @user_application_theme ||= Gitlab::Themes.for_user(current_user).css_class
end end
def user_color_scheme def user_color_scheme
......
...@@ -73,13 +73,11 @@ module Gitlab ...@@ -73,13 +73,11 @@ module Gitlab
private private
def default_id def default_id
@default_id ||= begin
id = Gitlab.config.gitlab.default_theme.to_i id = Gitlab.config.gitlab.default_theme.to_i
theme_ids = THEMES.map(&:id)
# Prevent an invalid configuration setting from causing an infinite loop theme_ids.include?(id) ? id : APPLICATION_DEFAULT
if id < THEMES.first.id || id > THEMES.last.id
APPLICATION_DEFAULT
else
id
end end
end end
end end
......
require 'spec_helper' require 'spec_helper'
describe PreferencesHelper do describe PreferencesHelper do
describe 'dashboard_choices' do describe '#dashboard_choices' do
it 'raises an exception when defined choices may be missing' do it 'raises an exception when defined choices may be missing' do
expect(User).to receive(:dashboards).and_return(foo: 'foo') expect(User).to receive(:dashboards).and_return(foo: 'foo')
expect { helper.dashboard_choices }.to raise_error(RuntimeError) expect { helper.dashboard_choices }.to raise_error(RuntimeError)
...@@ -26,7 +26,7 @@ describe PreferencesHelper do ...@@ -26,7 +26,7 @@ describe PreferencesHelper do
end end
end end
describe 'user_application_theme' do describe '#user_application_theme' do
context 'with a user' do context 'with a user' do
it "returns user's theme's css_class" do it "returns user's theme's css_class" do
stub_user(theme_id: 3) stub_user(theme_id: 3)
...@@ -52,7 +52,7 @@ describe PreferencesHelper do ...@@ -52,7 +52,7 @@ describe PreferencesHelper do
end end
end end
describe 'user_color_scheme' do describe '#user_color_scheme' do
context 'with a user' do context 'with a user' do
it "returns user's scheme's css_class" do it "returns user's scheme's css_class" do
allow(helper).to receive(:current_user) allow(helper).to receive(:current_user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment