From 323959a86aa43d3db613ac026789632ccb245780 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 2 Apr 2019 10:57:54 +0100 Subject: [PATCH 1/2] Remove EE-specific lines from Groups::CreateService spec --- .../services/groups/create_service_spec.rb | 28 +++++++++++++++++-- spec/services/groups/create_service_spec.rb | 25 ----------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ee/spec/services/groups/create_service_spec.rb b/ee/spec/services/groups/create_service_spec.rb index 12ae3ffbe9adbb..fb38313a734e13 100644 --- a/ee/spec/services/groups/create_service_spec.rb +++ b/ee/spec/services/groups/create_service_spec.rb @@ -2,7 +2,7 @@ describe Groups::CreateService, '#execute' do let!(:user) { create :user } - let!(:opts) do + let!(:group_params) do { name: 'GitLab', path: 'group_path', @@ -12,7 +12,7 @@ context 'audit events' do include_examples 'audit event logging' do - let(:operation) { create_group(user, opts) } + let(:operation) { create_group(user, group_params) } let(:fail_condition!) do allow(Gitlab::VisibilityLevel).to receive(:allowed_for?).and_return(false) end @@ -33,6 +33,30 @@ end end + context 'repository_size_limit assignment as Bytes' do + let(:admin_user) { create(:user, admin: true) } + + context 'when param present' do + let(:opts) { { repository_size_limit: '100' } } + + it 'assign repository_size_limit as Bytes' do + group = create_group(admin_user, group_params.merge(opts)) + + expect(group.repository_size_limit).to eql(100 * 1024 * 1024) + end + end + + context 'when param not present' do + let(:opts) { { repository_size_limit: '' } } + + it 'assign nil value' do + group = create_group(admin_user, group_params.merge(opts)) + + expect(group.repository_size_limit).to be_nil + end + end + end + def create_group(user, opts) described_class.new(user, opts).execute end diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb index 188780fe5aaf52..fe6a8691ae0cb1 100644 --- a/spec/services/groups/create_service_spec.rb +++ b/spec/services/groups/create_service_spec.rb @@ -88,31 +88,6 @@ end end - context 'repository_size_limit assignment as Bytes' do - let(:admin_user) { create(:user, admin: true) } - let(:service) { described_class.new(admin_user, group_params.merge(opts)) } - - context 'when param present' do - let(:opts) { { repository_size_limit: '100' } } - - it 'assign repository_size_limit as Bytes' do - group = service.execute - - expect(group.repository_size_limit).to eql(100 * 1024 * 1024) - end - end - - context 'when param not present' do - let(:opts) { { repository_size_limit: '' } } - - it 'assign nil value' do - group = service.execute - - expect(group.repository_size_limit).to be_nil - end - end - end - describe 'creating a mattermost team' do let!(:params) { group_params.merge(create_chat_team: "true") } let!(:service) { described_class.new(user, params) } -- GitLab From 64775ced9aed352e8800047f5a793f6f46c599a4 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 2 Apr 2019 11:02:06 +0100 Subject: [PATCH 2/2] Remove EE-specific lines from Groups::UpdateService spec --- .../services/groups/update_service_spec.rb | 24 ++++++++++++++++++ spec/services/groups/update_service_spec.rb | 25 ------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ee/spec/services/groups/update_service_spec.rb b/ee/spec/services/groups/update_service_spec.rb index d47afddd213061..53e56da5779942 100644 --- a/ee/spec/services/groups/update_service_spec.rb +++ b/ee/spec/services/groups/update_service_spec.rb @@ -130,6 +130,30 @@ def update_file_template_project_id(id) end end + context 'repository_size_limit assignment as Bytes' do + let(:group) { create(:group, :public, repository_size_limit: 0) } + + context 'when param present' do + let(:opts) { { repository_size_limit: '100' } } + + it 'converts from MB to Bytes' do + update_group(group, user, opts) + + expect(group.reload.repository_size_limit).to eql(100 * 1024 * 1024) + end + end + + context 'when param not present' do + let(:opts) { { repository_size_limit: '' } } + + it 'assign nil value' do + update_group(group, user, opts) + + expect(group.reload.repository_size_limit).to be_nil + end + end + end + def update_group(group, user, opts) Groups::UpdateService.new(group, user, opts).execute end diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb index 03a2a05e39ab31..d87a7dd234d594 100644 --- a/spec/services/groups/update_service_spec.rb +++ b/spec/services/groups/update_service_spec.rb @@ -82,31 +82,6 @@ end end - context 'repository_size_limit assignment as Bytes' do - let(:group) { create(:group, :public, repository_size_limit: 0) } - let(:service) { described_class.new(group, user, opts) } - - context 'when param present' do - let(:opts) { { repository_size_limit: '100' } } - - it 'converts from MB to Bytes' do - service.execute - - expect(group.reload.repository_size_limit).to eql(100 * 1024 * 1024) - end - end - - context 'when param not present' do - let(:opts) { { repository_size_limit: '' } } - - it 'assign nil value' do - service.execute - - expect(group.reload.repository_size_limit).to be_nil - end - end - end - context "unauthorized visibility_level validation" do let!(:service) { described_class.new(internal_group, user, visibility_level: 99) } before do -- GitLab