diff options
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/close_service_spec.rb | 44 | ||||
-rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 34 | ||||
-rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 44 | ||||
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 98 | ||||
-rw-r--r-- | spec/services/merge_requests/reopen_service_spec.rb | 45 | ||||
-rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 65 |
6 files changed, 0 insertions, 330 deletions
diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb deleted file mode 100644 index b3cbfd4b5b8..00000000000 --- a/spec/services/merge_requests/close_service_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::CloseService do - let(:user) { create(:user) } - let(:user2) { create(:user) } - let(:merge_request) { create(:merge_request, assignee: user2) } - let(:project) { merge_request.project } - - before do - project.team << [user, :master] - project.team << [user2, :developer] - end - - describe :execute do - context 'valid params' do - let(:service) { MergeRequests::CloseService.new(project, user, {}) } - - before do - allow(service).to receive(:execute_hooks) - - @merge_request = service.execute(merge_request) - end - - it { expect(@merge_request).to be_valid } - it { expect(@merge_request).to be_closed } - - it 'should execute hooks with close action' do - expect(service).to have_received(:execute_hooks). - with(@merge_request, 'close') - end - - it 'should send email to user2 about assign of new merge_request' do - email = ActionMailer::Base.deliveries.last - expect(email.to.first).to eq(user2.email) - expect(email.subject).to include(merge_request.title) - end - - it 'should create system note about merge_request reassign' do - note = @merge_request.notes.last - expect(note.note).to include 'Status changed to closed' - end - end - end -end diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb deleted file mode 100644 index d9bfdf64308..00000000000 --- a/spec/services/merge_requests/create_service_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::CreateService do - let(:project) { create(:project) } - let(:user) { create(:user) } - - describe :execute do - context 'valid params' do - let(:opts) do - { - title: 'Awesome merge_request', - description: 'please fix', - source_branch: 'stable', - target_branch: 'master' - } - end - let(:service) { MergeRequests::CreateService.new(project, user, opts) } - - before do - project.team << [user, :master] - allow(service).to receive(:execute_hooks) - - @merge_request = service.execute - end - - it { expect(@merge_request).to be_valid } - it { expect(@merge_request.title).to eq('Awesome merge_request') } - - it 'should execute hooks with default action' do - expect(service).to have_received(:execute_hooks).with(@merge_request) - end - end - end -end diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb deleted file mode 100644 index 0a25fb12f4e..00000000000 --- a/spec/services/merge_requests/merge_service_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::MergeService do - let(:user) { create(:user) } - let(:user2) { create(:user) } - let(:merge_request) { create(:merge_request, assignee: user2) } - let(:project) { merge_request.project } - - before do - project.team << [user, :master] - project.team << [user2, :developer] - end - - describe :execute do - context 'valid params' do - let(:service) { MergeRequests::MergeService.new(project, user, {}) } - - before do - allow(service).to receive(:execute_hooks) - - service.execute(merge_request, 'Awesome message') - end - - it { expect(merge_request).to be_valid } - it { expect(merge_request).to be_merged } - - it 'should execute hooks with merge action' do - expect(service).to have_received(:execute_hooks). - with(merge_request, 'merge') - end - - it 'should send email to user2 about merge of new merge_request' do - email = ActionMailer::Base.deliveries.last - expect(email.to.first).to eq(user2.email) - expect(email.subject).to include(merge_request.title) - end - - it 'should create system note about merge_request merge' do - note = merge_request.notes.last - expect(note.note).to include 'Status changed to merged' - end - end - end -end diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb deleted file mode 100644 index 879df0c9c67..00000000000 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ /dev/null @@ -1,98 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::RefreshService do - let(:project) { create(:project) } - let(:user) { create(:user) } - let(:service) { MergeRequests::RefreshService } - - describe :execute do - before do - @user = create(:user) - group = create(:group) - group.add_owner(@user) - - @project = create(:project, namespace: group) - @fork_project = Projects::ForkService.new(@project, @user).execute - @merge_request = create(:merge_request, source_project: @project, - source_branch: 'master', - target_branch: 'feature', - target_project: @project) - - @fork_merge_request = create(:merge_request, source_project: @fork_project, - source_branch: 'master', - target_branch: 'feature', - target_project: @project) - - @commits = @merge_request.commits - - @oldrev = @commits.last.id - @newrev = @commits.first.id - end - - context 'push to origin repo source branch' do - before do - service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/master') - reload_mrs - end - - it { expect(@merge_request.notes).not_to be_empty } - it { expect(@merge_request).to be_open } - it { expect(@fork_merge_request).to be_open } - it { expect(@fork_merge_request.notes).to be_empty } - end - - context 'push to origin repo target branch' do - before do - service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature') - reload_mrs - end - - it { expect(@merge_request.notes.last.note).to include('changed to merged') } - it { expect(@merge_request).to be_merged } - it { expect(@fork_merge_request).to be_merged } - it { expect(@fork_merge_request.notes.last.note).to include('changed to merged') } - end - - context 'push to fork repo source branch' do - before do - service.new(@fork_project, @user).execute(@oldrev, @newrev, 'refs/heads/master') - reload_mrs - end - - it { expect(@merge_request.notes).to be_empty } - it { expect(@merge_request).to be_open } - it { expect(@fork_merge_request.notes.last.note).to include('Added 4 commits') } - it { expect(@fork_merge_request).to be_open } - end - - context 'push to fork repo target branch' do - before do - service.new(@fork_project, @user).execute(@oldrev, @newrev, 'refs/heads/feature') - reload_mrs - end - - it { expect(@merge_request.notes).to be_empty } - it { expect(@merge_request).to be_open } - it { expect(@fork_merge_request.notes).to be_empty } - it { expect(@fork_merge_request).to be_open } - end - - context 'push to origin repo target branch after fork project was removed' do - before do - @fork_project.destroy - service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature') - reload_mrs - end - - it { expect(@merge_request.notes.last.note).to include('changed to merged') } - it { expect(@merge_request).to be_merged } - it { expect(@fork_merge_request).to be_open } - it { expect(@fork_merge_request.notes).to be_empty } - end - - def reload_mrs - @merge_request.reload - @fork_merge_request.reload - end - end -end diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb deleted file mode 100644 index 9401bc3b558..00000000000 --- a/spec/services/merge_requests/reopen_service_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::ReopenService do - let(:user) { create(:user) } - let(:user2) { create(:user) } - let(:merge_request) { create(:merge_request, assignee: user2) } - let(:project) { merge_request.project } - - before do - project.team << [user, :master] - project.team << [user2, :developer] - end - - describe :execute do - context 'valid params' do - let(:service) { MergeRequests::ReopenService.new(project, user, {}) } - - before do - allow(service).to receive(:execute_hooks) - - merge_request.state = :closed - service.execute(merge_request) - end - - it { expect(merge_request).to be_valid } - it { expect(merge_request).to be_reopened } - - it 'should execute hooks with reopen action' do - expect(service).to have_received(:execute_hooks). - with(merge_request, 'reopen') - end - - it 'should send email to user2 about reopen of merge_request' do - email = ActionMailer::Base.deliveries.last - expect(email.to.first).to eq(user2.email) - expect(email.subject).to include(merge_request.title) - end - - it 'should create system note about merge_request reopen' do - note = merge_request.notes.last - expect(note.note).to include 'Status changed to reopened' - end - end - end -end diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb deleted file mode 100644 index 916b01e1c45..00000000000 --- a/spec/services/merge_requests/update_service_spec.rb +++ /dev/null @@ -1,65 +0,0 @@ -require 'spec_helper' - -describe MergeRequests::UpdateService do - let(:user) { create(:user) } - let(:user2) { create(:user) } - let(:merge_request) { create(:merge_request, :simple) } - let(:project) { merge_request.project } - let(:label) { create(:label) } - - before do - project.team << [user, :master] - project.team << [user2, :developer] - end - - describe :execute do - context 'valid params' do - let(:opts) do - { - title: 'New title', - description: 'Also please fix', - assignee_id: user2.id, - state_event: 'close', - label_ids: [label.id] - } - end - - let(:service) { MergeRequests::UpdateService.new(project, user, opts) } - - before do - allow(service).to receive(:execute_hooks) - - @merge_request = service.execute(merge_request) - @merge_request.reload - end - - it { expect(@merge_request).to be_valid } - it { expect(@merge_request.title).to eq('New title') } - it { expect(@merge_request.assignee).to eq(user2) } - it { expect(@merge_request).to be_closed } - it { expect(@merge_request.labels.count).to eq(1) } - it { expect(@merge_request.labels.first.title).to eq('Bug') } - - it 'should execute hooks with update action' do - expect(service).to have_received(:execute_hooks). - with(@merge_request, 'update') - end - - it 'should send email to user2 about assign of new merge_request' do - email = ActionMailer::Base.deliveries.last - expect(email.to.first).to eq(user2.email) - expect(email.subject).to include(merge_request.title) - end - - it 'should create system note about merge_request reassign' do - note = @merge_request.notes.last - expect(note.note).to include "Reassigned to \@#{user2.username}" - end - - it 'should create system note about merge_request label edit' do - note = @merge_request.notes[1] - expect(note.note).to include "Added ~#{label.id} label" - end - end - end -end |