Commit 13f017f0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix user model specs

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 8daa69a3
...@@ -241,59 +241,23 @@ describe User do ...@@ -241,59 +241,23 @@ describe User do
it { user.first_name.should == 'John' } it { user.first_name.should == 'John' }
end end
describe 'without defaults' do describe 'with defaults' do
let(:user) { User.new } let(:user) { User.new }
it "should not apply defaults to user" do it "should apply defaults to user" do
user.projects_limit.should == 10 user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
user.can_create_group.should be_true user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
user.theme_id.should == Gitlab::Theme::BASIC user.theme_id.should == Gitlab.config.gitlab.default_theme
end
end
context 'as admin' do
describe 'with defaults' do
let(:user) { User.build_user({}, as: :admin) }
it "should apply defaults to user" do
user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
user.theme_id.should == Gitlab.config.gitlab.default_theme
end
end
describe 'with default overrides' do
let(:user) { User.build_user({projects_limit: 123, can_create_group: true, can_create_team: true, theme_id: Gitlab::Theme::BASIC}, as: :admin) }
it "should apply defaults to user" do
Gitlab.config.gitlab.default_projects_limit.should_not == 123
Gitlab.config.gitlab.default_can_create_group.should_not be_true
Gitlab.config.gitlab.default_theme.should_not == Gitlab::Theme::BASIC
user.projects_limit.should == 123
user.can_create_group.should be_true
user.theme_id.should == Gitlab::Theme::BASIC
end
end end
end end
context 'as user' do describe 'with default overrides' do
describe 'with defaults' do let(:user) { User.new(projects_limit: 123, can_create_group: false, can_create_team: true, theme_id: Gitlab::Theme::BASIC) }
let(:user) { User.build_user }
it "should apply defaults to user" do it "should apply defaults to user" do
user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit user.projects_limit.should == 123
user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group user.can_create_group.should be_false
user.theme_id.should == Gitlab.config.gitlab.default_theme user.theme_id.should == Gitlab::Theme::BASIC
end
end
describe 'with default overrides' do
let(:user) { User.build_user(projects_limit: 123, can_create_group: true, theme_id: Gitlab::Theme::BASIC) }
it "should apply defaults to user" do
user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
user.theme_id.should == Gitlab.config.gitlab.default_theme
end
end end
end end
end end
......
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