Commit d4976829 authored by Robert Speicher's avatar Robert Speicher
Browse files

Auto-correct `RSpec/DescribedClass` violations

parent 0a556523
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
let(:user) { create(:user) } let(:user) { create(:user) }
describe '#check_password_expiration' do describe '#check_password_expiration' do
let(:controller) { ApplicationController.new } let(:controller) { described_class.new }
it 'redirects if the user is over their password expiry' do it 'redirects if the user is over their password expiry' do
user.password_expires_at = Time.new(2002) user.password_expires_at = Time.new(2002)
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
describe "#authenticate_user_from_token!" do describe "#authenticate_user_from_token!" do
describe "authenticating a user from a private token" do describe "authenticating a user from a private token" do
controller(ApplicationController) do controller(described_class) do
def index def index
render text: "authenticated" render text: "authenticated"
end end
...@@ -66,7 +66,7 @@ def index ...@@ -66,7 +66,7 @@ def index
end end
describe "authenticating a user from a personal access token" do describe "authenticating a user from a personal access token" do
controller(ApplicationController) do controller(described_class) do
def index def index
render text: 'authenticated' render text: 'authenticated'
end end
...@@ -115,7 +115,7 @@ def index ...@@ -115,7 +115,7 @@ def index
end end
context 'two-factor authentication' do context 'two-factor authentication' do
let(:controller) { ApplicationController.new } let(:controller) { described_class.new }
describe '#check_two_factor_requirement' do describe '#check_two_factor_requirement' do
subject { controller.send :check_two_factor_requirement } subject { controller.send :check_two_factor_requirement }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
set(:label_link) { create(:label_link, label: label, target: issue2) } set(:label_link) { create(:label_link, label: label, target: issue2) }
let(:search_user) { user } let(:search_user) { user }
let(:params) { {} } let(:params) { {} }
let(:issues) { IssuesFinder.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute } let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
before(:context) do before(:context) do
project1.team << [user, :master] project1.team << [user, :master]
...@@ -282,15 +282,15 @@ ...@@ -282,15 +282,15 @@
let!(:confidential_issue) { create(:issue, project: project, confidential: true) } let!(:confidential_issue) { create(:issue, project: project, confidential: true) }
it 'returns non confidential issues for nil user' do it 'returns non confidential issues for nil user' do
expect(IssuesFinder.send(:not_restricted_by_confidentiality, nil)).to include(public_issue) expect(described_class.send(:not_restricted_by_confidentiality, nil)).to include(public_issue)
end end
it 'returns non confidential issues for user not authorized for the issues projects' do it 'returns non confidential issues for user not authorized for the issues projects' do
expect(IssuesFinder.send(:not_restricted_by_confidentiality, user)).to include(public_issue) expect(described_class.send(:not_restricted_by_confidentiality, user)).to include(public_issue)
end end
it 'returns all issues for user authorized for the issues projects' do it 'returns all issues for user authorized for the issues projects' do
expect(IssuesFinder.send(:not_restricted_by_confidentiality, authorized_user)).to include(public_issue, confidential_issue) expect(described_class.send(:not_restricted_by_confidentiality, authorized_user)).to include(public_issue, confidential_issue)
end end
end end
end end
...@@ -23,26 +23,26 @@ ...@@ -23,26 +23,26 @@
describe "#execute" do describe "#execute" do
it 'filters by scope' do it 'filters by scope' do
params = { scope: 'authored', state: 'opened' } params = { scope: 'authored', state: 'opened' }
merge_requests = MergeRequestsFinder.new(user, params).execute merge_requests = described_class.new(user, params).execute
expect(merge_requests.size).to eq(3) expect(merge_requests.size).to eq(3)
end end
it 'filters by project' do it 'filters by project' do
params = { project_id: project1.id, scope: 'authored', state: 'opened' } params = { project_id: project1.id, scope: 'authored', state: 'opened' }
merge_requests = MergeRequestsFinder.new(user, params).execute merge_requests = described_class.new(user, params).execute
expect(merge_requests.size).to eq(1) expect(merge_requests.size).to eq(1)
end end
it 'filters by non_archived' do it 'filters by non_archived' do
params = { non_archived: true } params = { non_archived: true }
merge_requests = MergeRequestsFinder.new(user, params).execute merge_requests = described_class.new(user, params).execute
expect(merge_requests.size).to eq(3) expect(merge_requests.size).to eq(3)
end end
it 'filters by iid' do it 'filters by iid' do
params = { project_id: project1.id, iids: merge_request1.iid } params = { project_id: project1.id, iids: merge_request1.iid }
merge_requests = MergeRequestsFinder.new(user, params).execute merge_requests = described_class.new(user, params).execute
expect(merge_requests).to contain_exactly(merge_request1) expect(merge_requests).to contain_exactly(merge_request1)
end end
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
let!(:snippet3) { create(:personal_snippet, :public) } let!(:snippet3) { create(:personal_snippet, :public) }
it "returns all private and internal snippets" do it "returns all private and internal snippets" do
snippets = SnippetsFinder.new.execute(user, filter: :all) snippets = described_class.new.execute(user, filter: :all)
expect(snippets).to include(snippet2, snippet3) expect(snippets).to include(snippet2, snippet3)
expect(snippets).not_to include(snippet1) expect(snippets).not_to include(snippet1)
end end
it "returns all public snippets" do it "returns all public snippets" do
snippets = SnippetsFinder.new.execute(nil, filter: :all) snippets = described_class.new.execute(nil, filter: :all)
expect(snippets).to include(snippet3) expect(snippets).to include(snippet3)
expect(snippets).not_to include(snippet1, snippet2) expect(snippets).not_to include(snippet1, snippet2)
end end
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
let!(:snippet3) { create(:personal_snippet, :public) } let!(:snippet3) { create(:personal_snippet, :public) }
it "returns public public snippets" do it "returns public public snippets" do
snippets = SnippetsFinder.new.execute(nil, filter: :public) snippets = described_class.new.execute(nil, filter: :public)
expect(snippets).to include(snippet3) expect(snippets).to include(snippet3)
expect(snippets).not_to include(snippet1, snippet2) expect(snippets).not_to include(snippet1, snippet2)
...@@ -45,36 +45,36 @@ ...@@ -45,36 +45,36 @@
let!(:snippet3) { create(:personal_snippet, :public, author: user) } let!(:snippet3) { create(:personal_snippet, :public, author: user) }
it "returns all public and internal snippets" do it "returns all public and internal snippets" do
snippets = SnippetsFinder.new.execute(user1, filter: :by_user, user: user) snippets = described_class.new.execute(user1, filter: :by_user, user: user)
expect(snippets).to include(snippet2, snippet3) expect(snippets).to include(snippet2, snippet3)
expect(snippets).not_to include(snippet1) expect(snippets).not_to include(snippet1)
end end
it "returns internal snippets" do it "returns internal snippets" do
snippets = SnippetsFinder.new.execute(user, filter: :by_user, user: user, scope: "are_internal") snippets = described_class.new.execute(user, filter: :by_user, user: user, scope: "are_internal")
expect(snippets).to include(snippet2) expect(snippets).to include(snippet2)
expect(snippets).not_to include(snippet1, snippet3) expect(snippets).not_to include(snippet1, snippet3)
end end
it "returns private snippets" do it "returns private snippets" do
snippets = SnippetsFinder.new.execute(user, filter: :by_user, user: user, scope: "are_private") snippets = described_class.new.execute(user, filter: :by_user, user: user, scope: "are_private")
expect(snippets).to include(snippet1) expect(snippets).to include(snippet1)
expect(snippets).not_to include(snippet2, snippet3) expect(snippets).not_to include(snippet2, snippet3)
end end
it "returns public snippets" do it "returns public snippets" do
snippets = SnippetsFinder.new.execute(user, filter: :by_user, user: user, scope: "are_public") snippets = described_class.new.execute(user, filter: :by_user, user: user, scope: "are_public")
expect(snippets).to include(snippet3) expect(snippets).to include(snippet3)
expect(snippets).not_to include(snippet1, snippet2) expect(snippets).not_to include(snippet1, snippet2)
end end
it "returns all snippets" do it "returns all snippets" do
snippets = SnippetsFinder.new.execute(user, filter: :by_user, user: user) snippets = described_class.new.execute(user, filter: :by_user, user: user)
expect(snippets).to include(snippet1, snippet2, snippet3) expect(snippets).to include(snippet1, snippet2, snippet3)
end end
it "returns only public snippets if unauthenticated user" do it "returns only public snippets if unauthenticated user" do
snippets = SnippetsFinder.new.execute(nil, filter: :by_user, user: user) snippets = described_class.new.execute(nil, filter: :by_user, user: user)
expect(snippets).to include(snippet3) expect(snippets).to include(snippet3)
expect(snippets).not_to include(snippet2, snippet1) expect(snippets).not_to include(snippet2, snippet1)
end end
...@@ -88,43 +88,43 @@ ...@@ -88,43 +88,43 @@
end end
it "returns public snippets for unauthorized user" do it "returns public snippets for unauthorized user" do
snippets = SnippetsFinder.new.execute(nil, filter: :by_project, project: project1) snippets = described_class.new.execute(nil, filter: :by_project, project: project1)
expect(snippets).to include(@snippet3) expect(snippets).to include(@snippet3)
expect(snippets).not_to include(@snippet1, @snippet2) expect(snippets).not_to include(@snippet1, @snippet2)
end end
it "returns public and internal snippets for non project members" do it "returns public and internal snippets for non project members" do
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1) snippets = described_class.new.execute(user, filter: :by_project, project: project1)
expect(snippets).to include(@snippet2, @snippet3) expect(snippets).to include(@snippet2, @snippet3)
expect(snippets).not_to include(@snippet1) expect(snippets).not_to include(@snippet1)
end end
it "returns public snippets for non project members" do it "returns public snippets for non project members" do
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1, scope: "are_public") snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_public")
expect(snippets).to include(@snippet3) expect(snippets).to include(@snippet3)
expect(snippets).not_to include(@snippet1, @snippet2) expect(snippets).not_to include(@snippet1, @snippet2)
end end
it "returns internal snippets for non project members" do it "returns internal snippets for non project members" do
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1, scope: "are_internal") snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_internal")
expect(snippets).to include(@snippet2) expect(snippets).to include(@snippet2)
expect(snippets).not_to include(@snippet1, @snippet3) expect(snippets).not_to include(@snippet1, @snippet3)
end end
it "does not return private snippets for non project members" do it "does not return private snippets for non project members" do
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1, scope: "are_private") snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_private")
expect(snippets).not_to include(@snippet1, @snippet2, @snippet3) expect(snippets).not_to include(@snippet1, @snippet2, @snippet3)
end end
it "returns all snippets for project members" do it "returns all snippets for project members" do
project1.team << [user, :developer] project1.team << [user, :developer]
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1) snippets = described_class.new.execute(user, filter: :by_project, project: project1)
expect(snippets).to include(@snippet1, @snippet2, @snippet3) expect(snippets).to include(@snippet1, @snippet2, @snippet3)
end end
it "returns private snippets for project members" do it "returns private snippets for project members" do
project1.team << [user, :developer] project1.team << [user, :developer]
snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1, scope: "are_private") snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_private")
expect(snippets).to include(@snippet1) expect(snippets).to include(@snippet1)
end end
end end
......
...@@ -11,7 +11,7 @@ def fake_object(fresh:) ...@@ -11,7 +11,7 @@ def fake_object(fresh:)
end end
describe '#render_field' do describe '#render_field' do
let(:renderer) { Banzai::Renderer } let(:renderer) { described_class }
subject { renderer.render_field(object, :field) } subject { renderer.render_field(object, :field) }
context 'with a stale cache' do context 'with a stale cache' do
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
let(:invalid_changes) { 1 } let(:invalid_changes) { 1 }
context 'when changes is a valid string' do 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 it 'splits elements by newline character' do
expect(changes_list).to contain_exactly({ expect(changes_list).to contain_exactly({
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
describe Gitlab::Ci::Build::Credentials::Factory do describe Gitlab::Ci::Build::Credentials::Factory do
let(:build) { create(:ci_build, name: 'spinach', stage: 'test', stage_idx: 0) } 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 class TestProvider
def initialize(build); end def initialize(build); end
end end
before do 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 end
context 'when provider is valid' do context 'when provider is valid' do
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
let(:build) { create(:ci_build, name: 'spinach', stage: 'test', stage_idx: 0) } let(:build) { create(:ci_build, name: 'spinach', stage: 'test', stage_idx: 0) }
let(:registry_url) { 'registry.example.com:5005' } let(:registry_url) { 'registry.example.com:5005' }
subject { Gitlab::Ci::Build::Credentials::Registry.new(build) } subject { described_class.new(build) }
before do before do
stub_container_registry_config(host_port: registry_url) stub_container_registry_config(host_port: registry_url)
end end
it 'contains valid DockerRegistry credentials' do 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.username).to eq 'gitlab-ci-token'
expect(subject.password).to eq build.token expect(subject.password).to eq build.token
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
end end
describe '.valid?' do describe '.valid?' do
subject { Gitlab::Ci::Build::Credentials::Registry.new(build).valid? } subject { described_class.new(build).valid? }
context 'when registry is enabled' do context 'when registry is enabled' do
before do before do
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
describe '#current_application_settings' do describe '#current_application_settings' do
context 'with DB available' do context 'with DB available' do
before 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 end
it 'attempts to use cached values first' do it 'attempts to use cached values first' do
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
context 'with DB unavailable' do context 'with DB unavailable' do
before 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 end
it 'returns an in-memory ApplicationSetting object' do it 'returns an in-memory ApplicationSetting object' do
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
before do before do
allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return(Issue.all) 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 event
end end
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
["foo\n\n", 2], ["foo\n\n", 2],
].each do |string, line_count| ].each do |string, line_count|
it "counts #{line_count} lines in #{string.inspect}" do 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 end
end end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
describe Gitlab::GitalyClient::Ref do describe Gitlab::GitalyClient::Ref do
let(:project) { create(:empty_project) } let(:project) { create(:empty_project) }
let(:repo_path) { project.repository.path_to_repo } 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 before do
allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true) allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
it 'uses the configured name attribute and handles values as an array' do it 'uses the configured name attribute and handles values as an array' do
name = 'John Doe' name = 'John Doe'
entry['cn'] = [name] entry['cn'] = [name]
person = Gitlab::LDAP::Person.new(entry, 'ldapmain') person = described_class.new(entry, 'ldapmain')
expect(person.name).to eq(name) expect(person.name).to eq(name)
end end
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
it 'returns the value of mail, if present' do it 'returns the value of mail, if present' do
mail = 'john@example.com' mail = 'john@example.com'
entry['mail'] = mail entry['mail'] = mail
person = Gitlab::LDAP::Person.new(entry, 'ldapmain') person = described_class.new(entry, 'ldapmain')
expect(person.email).to eq([mail]) expect(person.email).to eq([mail])
end end
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
it 'returns the value of userPrincipalName, if mail and email are not present' do it 'returns the value of userPrincipalName, if mail and email are not present' do
user_principal_name = 'john.doe@example.com' user_principal_name = 'john.doe@example.com'
entry['userPrincipalName'] = user_principal_name 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]) expect(person.email).to eq([user_principal_name])
end end
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
expect(pool).to receive(:with).and_yield(connection) expect(pool).to receive(:with).and_yield(connection)
expect(connection).to receive(:write_points).with(an_instance_of(Array)) 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' => {} }]) described_class.submit_metrics([{ 'series' => 'kittens', 'tags' => {} }])
end end
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
describe '.measure' do describe '.measure' do
context 'without a transaction' do context 'without a transaction' do
it 'returns the return value of the block' 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) expect(val).to eq(10)
end end
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:transaction) { Gitlab::Metrics::Transaction.new }
before do before do
allow(Gitlab::Metrics).to receive(:current_transaction). allow(described_class).to receive(:current_transaction).
and_return(transaction) and_return(transaction)
end end