Disable RSpec/BeforeAfterAll and enable RSpec/ImplicitExpect cops
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
d52034b205
commit
1b0c6ffd51
5 changed files with 20 additions and 20 deletions
10
.rubocop.yml
10
.rubocop.yml
|
@ -965,6 +965,10 @@ RSpec/AnyInstance:
|
||||||
RSpec/BeEql:
|
RSpec/BeEql:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
|
# We don't enforce this as we use this technique in a few places.
|
||||||
|
RSpec/BeforeAfterAll:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
# Check that the first argument to the top level describe is the tested class or
|
# Check that the first argument to the top level describe is the tested class or
|
||||||
# module.
|
# module.
|
||||||
RSpec/DescribeClass:
|
RSpec/DescribeClass:
|
||||||
|
@ -1024,6 +1028,12 @@ RSpec/FilePath:
|
||||||
RSpec/Focus:
|
RSpec/Focus:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
|
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||||
|
# SupportedStyles: is_expected, should
|
||||||
|
RSpec/ImplicitExpect:
|
||||||
|
Enabled: true
|
||||||
|
EnforcedStyle: is_expected
|
||||||
|
|
||||||
# Checks for the usage of instance variables.
|
# Checks for the usage of instance variables.
|
||||||
RSpec/InstanceVariable:
|
RSpec/InstanceVariable:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
|
@ -6,10 +6,6 @@
|
||||||
# Note that changes in the inspected code, or installation of new
|
# Note that changes in the inspected code, or installation of new
|
||||||
# versions of RuboCop, may require this file to be generated again.
|
# versions of RuboCop, may require this file to be generated again.
|
||||||
|
|
||||||
# Offense count: 54
|
|
||||||
RSpec/BeforeAfterAll:
|
|
||||||
Enabled: false
|
|
||||||
|
|
||||||
# Offense count: 233
|
# Offense count: 233
|
||||||
RSpec/EmptyLineAfterFinalLet:
|
RSpec/EmptyLineAfterFinalLet:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
@ -24,12 +20,6 @@ RSpec/EmptyLineAfterSubject:
|
||||||
RSpec/HookArgument:
|
RSpec/HookArgument:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# Offense count: 12
|
|
||||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
|
||||||
# SupportedStyles: is_expected, should
|
|
||||||
RSpec/ImplicitExpect:
|
|
||||||
Enabled: false
|
|
||||||
|
|
||||||
# Offense count: 11
|
# Offense count: 11
|
||||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||||
# SupportedStyles: it_behaves_like, it_should_behave_like
|
# SupportedStyles: it_behaves_like, it_should_behave_like
|
||||||
|
|
|
@ -2,8 +2,8 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe ProjectGroupLink do
|
describe ProjectGroupLink do
|
||||||
describe "Associations" do
|
describe "Associations" do
|
||||||
it { should belong_to(:group) }
|
it { is_expected.to belong_to(:group) }
|
||||||
it { should belong_to(:project) }
|
it { is_expected.to belong_to(:project) }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "Validation" do
|
describe "Validation" do
|
||||||
|
@ -12,10 +12,10 @@ describe ProjectGroupLink do
|
||||||
let(:project) { create(:project, group: group) }
|
let(:project) { create(:project, group: group) }
|
||||||
let!(:project_group_link) { create(:project_group_link, project: project) }
|
let!(:project_group_link) { create(:project_group_link, project: project) }
|
||||||
|
|
||||||
it { should validate_presence_of(:project_id) }
|
it { is_expected.to validate_presence_of(:project_id) }
|
||||||
it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) }
|
it { is_expected.to validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) }
|
||||||
it { should validate_presence_of(:group) }
|
it { is_expected.to validate_presence_of(:group) }
|
||||||
it { should validate_presence_of(:group_access) }
|
it { is_expected.to validate_presence_of(:group_access) }
|
||||||
|
|
||||||
it "doesn't allow a project to be shared with the group it is in" do
|
it "doesn't allow a project to be shared with the group it is in" do
|
||||||
project_group_link.group = group
|
project_group_link.group = group
|
||||||
|
|
|
@ -3,8 +3,8 @@ require 'spec_helper'
|
||||||
describe ExternalWikiService, models: true do
|
describe ExternalWikiService, models: true do
|
||||||
include ExternalWikiHelper
|
include ExternalWikiHelper
|
||||||
describe "Associations" do
|
describe "Associations" do
|
||||||
it { should belong_to :project }
|
it { is_expected.to belong_to :project }
|
||||||
it { should have_one :service_hook }
|
it { is_expected.to have_one :service_hook }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Validations' do
|
describe 'Validations' do
|
||||||
|
|
|
@ -823,13 +823,13 @@ describe Project, models: true do
|
||||||
|
|
||||||
let(:avatar_path) { "/#{project.full_path}/avatar" }
|
let(:avatar_path) { "/#{project.full_path}/avatar" }
|
||||||
|
|
||||||
it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
|
it { is_expected.to eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when git repo is empty' do
|
context 'when git repo is empty' do
|
||||||
let(:project) { create(:empty_project) }
|
let(:project) { create(:empty_project) }
|
||||||
|
|
||||||
it { should eq nil }
|
it { is_expected.to eq nil }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue