Fix user model specs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 11 insertions, 47 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6b12a0663a2..a36b57a95de 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -241,59 +241,23 @@ describe User do
       it { user.first_name.should == 'John' }
     end
 
-    describe 'without defaults' do
+    describe 'with defaults' do
       let(:user) { User.new }
 
-      it "should not apply defaults to user" do
-        user.projects_limit.should == 10
-        user.can_create_group.should be_true
-        user.theme_id.should == Gitlab::Theme::BASIC
-      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
+      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
 
-    context 'as user' do
-      describe 'with defaults' do
-        let(:user) { User.build_user }
+    describe 'with default overrides' do
+      let(:user) { User.new(projects_limit: 123, can_create_group: false, can_create_team: 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
-
-      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
+      it "should apply defaults to user" do
+        user.projects_limit.should == 123
+        user.can_create_group.should be_false
+        user.theme_id.should == Gitlab::Theme::BASIC
       end
     end
   end