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

Enable `RSpec/DescribedClass` cop and correct violations

See merge request !10930

17 files changed, 38 insertions, 38 deletions

diff --git a/spec/lib/banzai/renderer_spec.rb b/spec/lib/banzai/renderer_spec.rb
index e6f8d2a1fed..0e094405e33 100644
--- a/spec/lib/banzai/renderer_spec.rb
+++ b/spec/lib/banzai/renderer_spec.rb
@@ -11,7 +11,7 @@ describe Banzai::Renderer do
   end
 
   describe '#render_field' do
-    let(:renderer) { Banzai::Renderer }
+    let(:renderer) { described_class }
     subject { renderer.render_field(object, :field) }
 
     context 'with a stale cache' do
diff --git a/spec/lib/gitlab/changes_list_spec.rb b/spec/lib/gitlab/changes_list_spec.rb
index 69d86144e32..464508fcd73 100644
--- a/spec/lib/gitlab/changes_list_spec.rb
+++ b/spec/lib/gitlab/changes_list_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::ChangesList do
   let(:invalid_changes) { 1 }
 
   context 'when changes is a valid string' do
-    let(:changes_list) { Gitlab::ChangesList.new(valid_changes_string) }
+    let(:changes_list) { described_class.new(valid_changes_string) }
 
     it 'splits elements by newline character' do
       expect(changes_list).to contain_exactly({
diff --git a/spec/lib/gitlab/ci/build/credentials/factory_spec.rb b/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
index 10b4b7a8826..d53db05e5e6 100644
--- a/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
+++ b/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
@@ -3,14 +3,14 @@ require 'spec_helper'
 describe Gitlab::Ci::Build::Credentials::Factory do
   let(:build) { create(:ci_build, name: 'spinach', stage: 'test', stage_idx: 0) }
 
-  subject { Gitlab::Ci::Build::Credentials::Factory.new(build).create! }
+  subject { described_class.new(build).create! }
 
   class TestProvider
     def initialize(build); end
   end
 
   before do
-    allow_any_instance_of(Gitlab::Ci::Build::Credentials::Factory).to receive(:providers).and_return([TestProvider])
+    allow_any_instance_of(described_class).to receive(:providers).and_return([TestProvider])
   end
 
   context 'when provider is valid' do
diff --git a/spec/lib/gitlab/ci/build/credentials/registry_spec.rb b/spec/lib/gitlab/ci/build/credentials/registry_spec.rb
index 84e44dd53e2..c6054138cde 100644
--- a/spec/lib/gitlab/ci/build/credentials/registry_spec.rb
+++ b/spec/lib/gitlab/ci/build/credentials/registry_spec.rb
@@ -4,14 +4,14 @@ describe Gitlab::Ci::Build::Credentials::Registry do
   let(:build) { create(:ci_build, name: 'spinach', stage: 'test', stage_idx: 0) }
   let(:registry_url) { 'registry.example.com:5005' }
 
-  subject { Gitlab::Ci::Build::Credentials::Registry.new(build) }
+  subject { described_class.new(build) }
 
   before do
     stub_container_registry_config(host_port: registry_url)
   end
 
   it 'contains valid DockerRegistry credentials' do
-    expect(subject).to be_kind_of(Gitlab::Ci::Build::Credentials::Registry)
+    expect(subject).to be_kind_of(described_class)
 
     expect(subject.username).to eq 'gitlab-ci-token'
     expect(subject.password).to eq build.token
@@ -20,7 +20,7 @@ describe Gitlab::Ci::Build::Credentials::Registry do
   end
 
   describe '.valid?' do
-    subject { Gitlab::Ci::Build::Credentials::Registry.new(build).valid? }
+    subject { described_class.new(build).valid? }
 
     context 'when registry is enabled' do
       before do
diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb
index b01c4805a34..c796c98ec9f 100644
--- a/spec/lib/gitlab/current_settings_spec.rb
+++ b/spec/lib/gitlab/current_settings_spec.rb
@@ -10,7 +10,7 @@ describe Gitlab::CurrentSettings do
   describe '#current_application_settings' do
     context 'with DB available' do
       before do
-        allow_any_instance_of(Gitlab::CurrentSettings).to receive(:connect_to_db?).and_return(true)
+        allow_any_instance_of(described_class).to receive(:connect_to_db?).and_return(true)
       end
 
       it 'attempts to use cached values first' do
@@ -36,7 +36,7 @@ describe Gitlab::CurrentSettings do
 
     context 'with DB unavailable' do
       before do
-        allow_any_instance_of(Gitlab::CurrentSettings).to receive(:connect_to_db?).and_return(false)
+        allow_any_instance_of(described_class).to receive(:connect_to_db?).and_return(false)
       end
 
       it 'returns an in-memory ApplicationSetting object' do
diff --git a/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
index c455cd9b942..d8757c601ab 100644
--- a/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
@@ -20,7 +20,7 @@ describe Gitlab::CycleAnalytics::BaseEventFetcher do
 
   before do
     allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return(Issue.all)
-    allow_any_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher).to receive(:serialize) do |event|
+    allow_any_instance_of(described_class).to receive(:serialize) do |event|
       event
     end
 
diff --git a/spec/lib/gitlab/git/util_spec.rb b/spec/lib/gitlab/git/util_spec.rb
index bcca4d4c746..69d3ca55397 100644
--- a/spec/lib/gitlab/git/util_spec.rb
+++ b/spec/lib/gitlab/git/util_spec.rb
@@ -9,7 +9,7 @@ describe Gitlab::Git::Util do
       ["foo\n\n", 2],
     ].each do |string, line_count|
       it "counts #{line_count} lines in #{string.inspect}" do
-        expect(Gitlab::Git::Util.count_lines(string)).to eq(line_count)
+        expect(described_class.count_lines(string)).to eq(line_count)
       end
     end
   end
diff --git a/spec/lib/gitlab/gitaly_client/ref_spec.rb b/spec/lib/gitlab/gitaly_client/ref_spec.rb
index 5405eafd281..255f23e6270 100644
--- a/spec/lib/gitlab/gitaly_client/ref_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::GitalyClient::Ref do
   let(:project) { create(:empty_project) }
   let(:repo_path) { project.repository.path_to_repo }
-  let(:client) { Gitlab::GitalyClient::Ref.new(project.repository) }
+  let(:client) { described_class.new(project.repository) }
 
   before do
     allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)
diff --git a/spec/lib/gitlab/ldap/person_spec.rb b/spec/lib/gitlab/ldap/person_spec.rb
index 9a556cde5d5..087c4d8c92c 100644
--- a/spec/lib/gitlab/ldap/person_spec.rb
+++ b/spec/lib/gitlab/ldap/person_spec.rb
@@ -20,7 +20,7 @@ describe Gitlab::LDAP::Person do
     it 'uses the configured name attribute and handles values as an array' do
       name = 'John Doe'
       entry['cn'] = [name]
-      person = Gitlab::LDAP::Person.new(entry, 'ldapmain')
+      person = described_class.new(entry, 'ldapmain')
 
       expect(person.name).to eq(name)
     end
@@ -30,7 +30,7 @@ describe Gitlab::LDAP::Person do
     it 'returns the value of mail, if present' do
       mail = 'john@example.com'
       entry['mail'] = mail
-      person = Gitlab::LDAP::Person.new(entry, 'ldapmain')
+      person = described_class.new(entry, 'ldapmain')
 
       expect(person.email).to eq([mail])
     end
@@ -38,7 +38,7 @@ describe Gitlab::LDAP::Person do
     it 'returns the value of userPrincipalName, if mail and email are not present' do
       user_principal_name = 'john.doe@example.com'
       entry['userPrincipalName'] = user_principal_name
-      person = Gitlab::LDAP::Person.new(entry, 'ldapmain')
+      person = described_class.new(entry, 'ldapmain')
 
       expect(person.email).to eq([user_principal_name])
     end
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index ab6e311b1e8..208a8d028cd 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -20,7 +20,7 @@ describe Gitlab::Metrics do
 
       expect(pool).to receive(:with).and_yield(connection)
       expect(connection).to receive(:write_points).with(an_instance_of(Array))
-      expect(Gitlab::Metrics).to receive(:pool).and_return(pool)
+      expect(described_class).to receive(:pool).and_return(pool)
 
       described_class.submit_metrics([{ 'series' => 'kittens', 'tags' => {} }])
     end
@@ -64,7 +64,7 @@ describe Gitlab::Metrics do
   describe '.measure' do
     context 'without a transaction' do
       it 'returns the return value of the block' do
-        val = Gitlab::Metrics.measure(:foo) { 10 }
+        val = described_class.measure(:foo) { 10 }
 
         expect(val).to eq(10)
       end
@@ -74,7 +74,7 @@ describe Gitlab::Metrics do
       let(:transaction) { Gitlab::Metrics::Transaction.new }
 
       before do
-        allow(Gitlab::Metrics).to receive(:current_transaction).
+        allow(described_class).to receive(:current_transaction).
           and_return(transaction)
       end
 
@@ -88,11 +88,11 @@ describe Gitlab::Metrics do
         expect(transaction).to receive(:increment).
           with('foo_call_count', 1)
 
-        Gitlab::Metrics.measure(:foo) { 10 }
+        described_class.measure(:foo) { 10 }
       end
 
       it 'returns the return value of the block' do
-        val = Gitlab::Metrics.measure(:foo) { 10 }
+        val = described_class.measure(:foo) { 10 }
 
         expect(val).to eq(10)
       end
@@ -105,7 +105,7 @@ describe Gitlab::Metrics do
         expect_any_instance_of(Gitlab::Metrics::Transaction).
           not_to receive(:add_tag)
 
-        Gitlab::Metrics.tag_transaction(:foo, 'bar')
+        described_class.tag_transaction(:foo, 'bar')
       end
     end
 
@@ -113,13 +113,13 @@ describe Gitlab::Metrics do
       let(:transaction) { Gitlab::Metrics::Transaction.new }
 
       it 'adds the tag to the transaction' do
-        expect(Gitlab::Metrics).to receive(:current_transaction).
+        expect(described_class).to receive(:current_transaction).
           and_return(transaction)
 
         expect(transaction).to receive(:add_tag).
           with(:foo, 'bar')
 
-        Gitlab::Metrics.tag_transaction(:foo, 'bar')
+        described_class.tag_transaction(:foo, 'bar')
       end
     end
   end
@@ -130,7 +130,7 @@ describe Gitlab::Metrics do
         expect_any_instance_of(Gitlab::Metrics::Transaction).
           not_to receive(:action=)
 
-        Gitlab::Metrics.action = 'foo'
+        described_class.action = 'foo'
       end
     end
 
@@ -138,12 +138,12 @@ describe Gitlab::Metrics do
       it 'sets the action of a transaction' do
         trans = Gitlab::Metrics::Transaction.new
 
-        expect(Gitlab::Metrics).to receive(:current_transaction).
+        expect(described_class).to receive(:current_transaction).
           and_return(trans)
 
         expect(trans).to receive(:action=).with('foo')
 
-        Gitlab::Metrics.action = 'foo'
+        described_class.action = 'foo'
       end
     end
   end
@@ -160,7 +160,7 @@ describe Gitlab::Metrics do
         expect_any_instance_of(Gitlab::Metrics::Transaction).
           not_to receive(:add_event)
 
-        Gitlab::Metrics.add_event(:meow)
+        described_class.add_event(:meow)
       end
     end
 
@@ -170,10 +170,10 @@ describe Gitlab::Metrics do
 
         expect(transaction).to receive(:add_event).with(:meow)
 
-        expect(Gitlab::Metrics).to receive(:current_transaction).
+        expect(described_class).to receive(:current_transaction).
           and_return(transaction)
 
-        Gitlab::Metrics.add_event(:meow)
+        described_class.add_event(:meow)
       end
     end
   end
diff --git a/spec/lib/gitlab/sidekiq_throttler_spec.rb b/spec/lib/gitlab/sidekiq_throttler_spec.rb
index ff32e0e699d..6374ac80207 100644
--- a/spec/lib/gitlab/sidekiq_throttler_spec.rb
+++ b/spec/lib/gitlab/sidekiq_throttler_spec.rb
@@ -13,14 +13,14 @@ describe Gitlab::SidekiqThrottler do
 
   describe '#execute!' do
     it 'sets limits on the selected queues' do
-      Gitlab::SidekiqThrottler.execute!
+      described_class.execute!
 
       expect(Sidekiq::Queue['build'].limit).to eq 4
       expect(Sidekiq::Queue['project_cache'].limit).to eq 4
     end
 
     it 'does not set limits on other queues' do
-      Gitlab::SidekiqThrottler.execute!
+      described_class.execute!
 
       expect(Sidekiq::Queue['merge'].limit).to be_nil
     end
diff --git a/spec/lib/gitlab/slash_commands/dsl_spec.rb b/spec/lib/gitlab/slash_commands/dsl_spec.rb
index 26217a0e3b2..2763d950716 100644
--- a/spec/lib/gitlab/slash_commands/dsl_spec.rb
+++ b/spec/lib/gitlab/slash_commands/dsl_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::SlashCommands::Dsl do
   before :all do
     DummyClass = Struct.new(:project) do
-      include Gitlab::SlashCommands::Dsl
+      include Gitlab::SlashCommands::Dsl # rubocop:disable RSpec/DescribedClass
 
       desc 'A command with no args'
       command :no_args, :none do
diff --git a/spec/lib/gitlab/template/gitignore_template_spec.rb b/spec/lib/gitlab/template/gitignore_template_spec.rb
index 9750a012e22..97797f42aaa 100644
--- a/spec/lib/gitlab/template/gitignore_template_spec.rb
+++ b/spec/lib/gitlab/template/gitignore_template_spec.rb
@@ -24,7 +24,7 @@ describe Gitlab::Template::GitignoreTemplate do
     it 'returns the Gitignore object of a valid file' do
       ruby = subject.find('Ruby')
 
-      expect(ruby).to be_a Gitlab::Template::GitignoreTemplate
+      expect(ruby).to be_a described_class
       expect(ruby.name).to eq('Ruby')
     end
   end
diff --git a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
index e3b8321eda3..6541326d1de 100644
--- a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
+++ b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
@@ -25,7 +25,7 @@ describe Gitlab::Template::GitlabCiYmlTemplate do
     it 'returns the GitlabCiYml object of a valid file' do
       ruby = subject.find('Ruby')
 
-      expect(ruby).to be_a Gitlab::Template::GitlabCiYmlTemplate
+      expect(ruby).to be_a described_class
       expect(ruby.name).to eq('Ruby')
     end
   end
diff --git a/spec/lib/gitlab/template/issue_template_spec.rb b/spec/lib/gitlab/template/issue_template_spec.rb
index 9213ced7b19..329d1d74970 100644
--- a/spec/lib/gitlab/template/issue_template_spec.rb
+++ b/spec/lib/gitlab/template/issue_template_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Template::IssueTemplate do
     it 'returns the issue object of a valid file' do
       ruby = subject.find('bug', project)
 
-      expect(ruby).to be_a Gitlab::Template::IssueTemplate
+      expect(ruby).to be_a described_class
       expect(ruby.name).to eq('bug')
     end
   end
diff --git a/spec/lib/gitlab/template/merge_request_template_spec.rb b/spec/lib/gitlab/template/merge_request_template_spec.rb
index 77dd3079e22..2b0056d9bab 100644
--- a/spec/lib/gitlab/template/merge_request_template_spec.rb
+++ b/spec/lib/gitlab/template/merge_request_template_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Template::MergeRequestTemplate do
     it 'returns the merge request object of a valid file' do
       ruby = subject.find('bug', project)
 
-      expect(ruby).to be_a Gitlab::Template::MergeRequestTemplate
+      expect(ruby).to be_a described_class
       expect(ruby.name).to eq('bug')
     end
   end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 7f21288cf88..bf1dfe7f412 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::UsageData do
   let!(:board) { create(:board, project: project) }
 
   describe '#data' do
-    subject { Gitlab::UsageData.data }
+    subject { described_class.data }
 
     it "gathers usage data" do
       expect(subject.keys).to match_array(%i(
@@ -58,7 +58,7 @@ describe Gitlab::UsageData do
   end
 
   describe '#license_usage_data' do
-    subject { Gitlab::UsageData.license_usage_data }
+    subject { described_class.license_usage_data }
 
     it "gathers license data" do
       expect(subject[:uuid]).to eq(current_application_settings.uuid)