summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/merge_service_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
-rw-r--r--spec/services/merge_requests/merge_service_spec.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 19d9e4049fe..e593bfeeaf7 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe MergeRequests::MergeService, services: true do
+describe MergeRequests::MergeService do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let(:merge_request) { create(:merge_request, :simple, author: user2, assignee: user2) }
@@ -13,7 +13,7 @@ describe MergeRequests::MergeService, services: true do
describe '#execute' do
context 'valid params' do
- let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
+ let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
before do
allow(service).to receive(:execute_hooks)
@@ -112,7 +112,7 @@ describe MergeRequests::MergeService, services: true do
context 'closes related todos' do
let(:merge_request) { create(:merge_request, assignee: user, author: user) }
let(:project) { merge_request.project }
- let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
+ let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
let!(:todo) do
create(:todo, :assigned,
project: project,
@@ -136,7 +136,7 @@ describe MergeRequests::MergeService, services: true do
context 'source branch removal' do
context 'when the source branch is protected' do
let(:service) do
- MergeRequests::MergeService.new(project, user, should_remove_source_branch: '1')
+ described_class.new(project, user, should_remove_source_branch: '1')
end
before do
@@ -151,7 +151,7 @@ describe MergeRequests::MergeService, services: true do
context 'when the source branch is the default branch' do
let(:service) do
- MergeRequests::MergeService.new(project, user, should_remove_source_branch: '1')
+ described_class.new(project, user, should_remove_source_branch: '1')
end
before do
@@ -169,7 +169,7 @@ describe MergeRequests::MergeService, services: true do
let(:service) do
merge_request.merge_params['force_remove_source_branch'] = '1'
merge_request.save!
- MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message')
+ described_class.new(project, user, commit_message: 'Awesome message')
end
it 'removes the source branch using the author user' do
@@ -182,7 +182,7 @@ describe MergeRequests::MergeService, services: true do
context 'when MR merger set the source branch to be removed' do
let(:service) do
- MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message', should_remove_source_branch: '1')
+ described_class.new(project, user, commit_message: 'Awesome message', should_remove_source_branch: '1')
end
it 'removes the source branch using the current user' do
@@ -196,7 +196,7 @@ describe MergeRequests::MergeService, services: true do
end
context "error handling" do
- let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
+ let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
before do
allow(Rails.logger).to receive(:error)