diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
commit | 9b177bb7c94df6c7d3868235f75939a41acf8718 (patch) | |
tree | ef8541d3ef8047f2ac6711b6e030244f812b7b49 /spec/models/user_spec.rb | |
parent | 73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff) | |
download | gitlab-ce-revert-2f46c3a8.tar.gz |
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 3ba01313efb..c1affa812aa 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -716,6 +716,7 @@ describe User do it "applies defaults to user" do expect(user.projects_limit).to eq(Gitlab.config.gitlab.default_projects_limit) expect(user.can_create_group).to eq(Gitlab.config.gitlab.default_can_create_group) + expect(user.theme_id).to eq(Gitlab.config.gitlab.default_theme) expect(user.external).to be_falsey end end @@ -726,6 +727,7 @@ describe User do it "applies defaults to user" do expect(user.projects_limit).to eq(123) expect(user.can_create_group).to be_falsey + expect(user.theme_id).to eq(1) end end |