Merge branch 'rs-described_class-cop-2' into 'master'

Enable `RSpec/DescribedClass` cop and correct violations

See merge request !10930

3 files changed, 9 insertions, 9 deletions

diff --git a/spec/services/merge_requests/get_urls_service_spec.rb b/spec/services/merge_requests/get_urls_service_spec.rb
index 290e00ea1ba..4a7d8ab4c6c 100644
--- a/spec/services/merge_requests/get_urls_service_spec.rb
+++ b/spec/services/merge_requests/get_urls_service_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe MergeRequests::GetUrlsService do
   let(:project) { create(:project, :public, :repository) }
-  let(:service) { MergeRequests::GetUrlsService.new(project) }
+  let(:service) { described_class.new(project) }
   let(:source_branch) { "my_branch" }
   let(:new_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=#{source_branch}" }
   let(:show_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/#{merge_request.iid}" }
@@ -89,7 +89,7 @@ describe MergeRequests::GetUrlsService do
       let!(:merge_request) { create(:merge_request, source_project: forked_project, target_project: project, source_branch: source_branch) }
       let(:changes) { existing_branch_changes }
       # Source project is now the forked one
-      let(:service) { MergeRequests::GetUrlsService.new(forked_project) }
+      let(:service) { described_class.new(forked_project) }
 
       before do
         allow(forked_project).to receive(:empty_repo?).and_return(false)
diff --git a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
index 35804d41b46..935f4710851 100644
--- a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
+++ b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe MergeRequests::MergeRequestDiffCacheService do
-  let(:subject) { MergeRequests::MergeRequestDiffCacheService.new }
+  let(:subject) { described_class.new }
 
   describe '#execute' do
     it 'retrieves the diff files to cache the highlighted result' do
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb
index eaf7785e549..3afd6b92900 100644
--- a/spec/services/merge_requests/resolve_service_spec.rb
+++ b/spec/services/merge_requests/resolve_service_spec.rb
@@ -50,7 +50,7 @@ describe MergeRequests::ResolveService do
 
       context 'when the source and target project are the same' do
         before do
-          MergeRequests::ResolveService.new(project, user, params).execute(merge_request)
+          described_class.new(project, user, params).execute(merge_request)
         end
 
         it 'creates a commit with the message' do
@@ -75,7 +75,7 @@ describe MergeRequests::ResolveService do
         end
 
         before do
-          MergeRequests::ResolveService.new(fork_project, user, params).execute(merge_request_from_fork)
+          described_class.new(fork_project, user, params).execute(merge_request_from_fork)
         end
 
         it 'creates a commit with the message' do
@@ -115,7 +115,7 @@ describe MergeRequests::ResolveService do
       end
 
       before do
-        MergeRequests::ResolveService.new(project, user, params).execute(merge_request)
+        described_class.new(project, user, params).execute(merge_request)
       end
 
       it 'creates a commit with the message' do
@@ -154,7 +154,7 @@ describe MergeRequests::ResolveService do
         }
       end
 
-      let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
+      let(:service) { described_class.new(project, user, invalid_params) }
 
       it 'raises a MissingResolution error' do
         expect { service.execute(merge_request) }.
@@ -180,7 +180,7 @@ describe MergeRequests::ResolveService do
         }
       end
 
-      let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
+      let(:service) { described_class.new(project, user, invalid_params) }
 
       it 'raises a MissingResolution error' do
         expect { service.execute(merge_request) }.
@@ -202,7 +202,7 @@ describe MergeRequests::ResolveService do
         }
       end
 
-      let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
+      let(:service) { described_class.new(project, user, invalid_params) }
 
       it 'raises a MissingFiles error' do
         expect { service.execute(merge_request) }.