diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-07 10:37:02 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-07 10:37:02 +0300 |
commit | 164dbc6b77558e29fd9a1553048d314457dc6990 (patch) | |
tree | bd5076a584a04b3de2333cbbce51eefa7bf3353c /spec | |
parent | ce001db93846bc693be0277bde163850da62f292 (diff) |
Resolve "Introduce new navigation themes in GitLab 11.0"
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/preferences_helper_spec.rb | 6 | ||||
-rw-r--r-- | spec/lib/gitlab/themes_spec.rb | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb index c9d2ec8a4ae..9940656fb68 100644 --- a/spec/helpers/preferences_helper_spec.rb +++ b/spec/helpers/preferences_helper_spec.rb @@ -31,9 +31,9 @@ describe PreferencesHelper do describe '#user_application_theme' do context 'with a user' do it "returns user's theme's css_class" do - stub_user(theme_id: 3) + stub_user(theme_id: 10) - expect(helper.user_application_theme).to eq 'ui_light' + expect(helper.user_application_theme).to eq 'ui-light' end it 'returns the default when id is invalid' do @@ -41,7 +41,7 @@ describe PreferencesHelper do allow(Gitlab.config.gitlab).to receive(:default_theme).and_return(1) - expect(helper.user_application_theme).to eq 'ui_indigo' + expect(helper.user_application_theme).to eq 'ui-indigo' end end diff --git a/spec/lib/gitlab/themes_spec.rb b/spec/lib/gitlab/themes_spec.rb index ecacea6bb35..af2f4568017 100644 --- a/spec/lib/gitlab/themes_spec.rb +++ b/spec/lib/gitlab/themes_spec.rb @@ -5,16 +5,16 @@ describe Gitlab::Themes, lib: true do it 'returns a space-separated list of class names' do css = described_class.body_classes - expect(css).to include('ui_indigo') - expect(css).to include(' ui_dark ') - expect(css).to include(' ui_blue') + expect(css).to include('ui-indigo') + expect(css).to include('ui-dark ') + expect(css).to include('ui-blue') end end describe '.by_id' do it 'returns a Theme by its ID' do expect(described_class.by_id(1).name).to eq 'Indigo' - expect(described_class.by_id(3).name).to eq 'Light' + expect(described_class.by_id(10).name).to eq 'Light' end end |