From 13a4971dde7e6b4ba8b9d0dbd3cfdfdfcf3370b7 Mon Sep 17 00:00:00 2001
From: Vitali Tatarintev <vtatarintev@gitlab.com>
Date: Mon, 24 Feb 2025 12:16:48 +0100
Subject: [PATCH] Fix RSpec/BeNil rubocop offenses
Fix RSpec/BeNil rubocop offenses
---
.rubocop_todo/rspec/be_nil.yml | 15 ---------------
spec/serializers/issue_entity_spec.rb | 2 +-
spec/serializers/member_user_entity_spec.rb | 4 ++--
.../alerts/todo/create_service_spec.rb | 4 ++--
spec/services/groups/transfer_service_spec.rb | 4 ++--
.../services/merge_requests/merge_service_spec.rb | 2 +-
.../ml_model/create_package_file_service_spec.rb | 2 +-
.../npm/generate_metadata_service_spec.rb | 10 +++++-----
.../projects/create_from_template_service_spec.rb | 4 ++--
.../projects/enable_deploy_key_service_spec.rb | 2 +-
.../create_service_spec.rb | 2 +-
.../custom_emails/create_service_spec.rb | 4 ++--
.../custom_emails/destroy_service_spec.rb | 4 ++--
spec/services/suggestions/apply_service_spec.rb | 2 +-
spec/services/users/untrust_service_spec.rb | 2 +-
.../upsert_credit_card_validation_service_spec.rb | 2 +-
16 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/.rubocop_todo/rspec/be_nil.yml b/.rubocop_todo/rspec/be_nil.yml
index c0ce8404f75d2..c0cb2fd539ef3 100644
--- a/.rubocop_todo/rspec/be_nil.yml
+++ b/.rubocop_todo/rspec/be_nil.yml
@@ -69,21 +69,6 @@ RSpec/BeNil:
- 'spec/requests/api/markdown_uploads_spec.rb'
- 'spec/requests/api/merge_requests_spec.rb'
- 'spec/requests/api/settings_spec.rb'
- - 'spec/serializers/issue_entity_spec.rb'
- - 'spec/serializers/member_user_entity_spec.rb'
- - 'spec/services/alert_management/alerts/todo/create_service_spec.rb'
- - 'spec/services/groups/transfer_service_spec.rb'
- - 'spec/services/merge_requests/merge_service_spec.rb'
- - 'spec/services/packages/ml_model/create_package_file_service_spec.rb'
- - 'spec/services/packages/npm/generate_metadata_service_spec.rb'
- - 'spec/services/projects/create_from_template_service_spec.rb'
- - 'spec/services/projects/enable_deploy_key_service_spec.rb'
- - 'spec/services/service_desk/custom_email_verifications/create_service_spec.rb'
- - 'spec/services/service_desk/custom_emails/create_service_spec.rb'
- - 'spec/services/service_desk/custom_emails/destroy_service_spec.rb'
- - 'spec/services/suggestions/apply_service_spec.rb'
- - 'spec/services/users/untrust_service_spec.rb'
- - 'spec/services/users/upsert_credit_card_validation_service_spec.rb'
- 'spec/support/shared_examples/lib/gitlab/gitaly_client_shared_examples.rb'
- 'spec/support/shared_examples/lib/gitlab/template/template_shared_examples.rb'
- 'spec/support/shared_examples/models/diff_positionable_note_shared_examples.rb'
diff --git a/spec/serializers/issue_entity_spec.rb b/spec/serializers/issue_entity_spec.rb
index b9dcb982e0cea..051b8b5b89d52 100644
--- a/spec/serializers/issue_entity_spec.rb
+++ b/spec/serializers/issue_entity_spec.rb
@@ -135,7 +135,7 @@
it 'returns nil for archived project doc' do
response = described_class.new(resource, request: request).as_json
- expect(response[:archived_project_docs_path]).to be nil
+ expect(response[:archived_project_docs_path]).to be_nil
end
end
diff --git a/spec/serializers/member_user_entity_spec.rb b/spec/serializers/member_user_entity_spec.rb
index 638347738f23f..34df21b97d2ab 100644
--- a/spec/serializers/member_user_entity_spec.rb
+++ b/spec/serializers/member_user_entity_spec.rb
@@ -34,7 +34,7 @@
end
it 'does not expose `two_factor_enabled` by default' do
- expect(entity_hash[:two_factor_enabled]).to be(nil)
+ expect(entity_hash[:two_factor_enabled]).to be_nil
end
it 'correctly exposes `status.emoji`' do
@@ -61,7 +61,7 @@
end
it 'does not expose user two_factor_enabled' do
- expect(entity_hash[:two_factor_enabled]).to be(nil)
+ expect(entity_hash[:two_factor_enabled]).to be_nil
end
it 'matches json schema' do
diff --git a/spec/services/alert_management/alerts/todo/create_service_spec.rb b/spec/services/alert_management/alerts/todo/create_service_spec.rb
index e3be1ff62b201..792b8ed0b3933 100644
--- a/spec/services/alert_management/alerts/todo/create_service_spec.rb
+++ b/spec/services/alert_management/alerts/todo/create_service_spec.rb
@@ -15,7 +15,7 @@
it 'returns an error', :aggregate_failures do
expect(result.error?).to be(true)
expect(result.message).to eq('You have insufficient permissions to create a Todo for this alert')
- expect(result.payload[:todo]).to be(nil)
+ expect(result.payload[:todo]).to be_nil
expect(result.payload[:alert]).to be(alert)
end
end
@@ -65,7 +65,7 @@
it 'returns an error', :aggregate_failures do
expect(result.error?).to be(true)
expect(result.message).to be('You already have pending todo for this alert')
- expect(result.payload[:todo]).to be(nil)
+ expect(result.payload[:todo]).to be_nil
expect(result.payload[:alert]).to be(alert)
end
end
diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb
index 2aafdd48e742c..170009acb80d6 100644
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
@@ -52,7 +52,7 @@
it 'allows transfer' do
transfer_service.execute(new_group)
- expect(transfer_service.error).to be nil
+ expect(transfer_service.error).to be_nil
expect(group.parent).to eq(new_group)
end
end
@@ -114,7 +114,7 @@
it 'allows transfer' do
transfer_service.execute(nil)
- expect(transfer_service.error).to be nil
+ expect(transfer_service.error).to be_nil
expect(group.parent).to be_nil
end
end
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index f1eb6e564cdab..79370d17844b3 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -484,7 +484,7 @@
service.execute(merge_request)
- expect(merge_request.reload.should_remove_source_branch?).to be nil
+ expect(merge_request.reload.should_remove_source_branch?).to be_nil
end
context 'when the merger set the source branch not to be removed' do
diff --git a/spec/services/packages/ml_model/create_package_file_service_spec.rb b/spec/services/packages/ml_model/create_package_file_service_spec.rb
index 51c26daf70f4b..ac605ac0dee39 100644
--- a/spec/services/packages/ml_model/create_package_file_service_spec.rb
+++ b/spec/services/packages/ml_model/create_package_file_service_spec.rb
@@ -39,7 +39,7 @@
end
it 'does not create package file', :aggregate_failures do
- expect(execute_service).to be(nil)
+ expect(execute_service).to be_nil
end
end
diff --git a/spec/services/packages/npm/generate_metadata_service_spec.rb b/spec/services/packages/npm/generate_metadata_service_spec.rb
index c2b97cebbc2e9..b0a2495284b78 100644
--- a/spec/services/packages/npm/generate_metadata_service_spec.rb
+++ b/spec/services/packages/npm/generate_metadata_service_spec.rb
@@ -67,10 +67,10 @@
if params[:has_dependencies]
it { expect(subject.dig(package1.version, dependency_type.to_s)).to be_any }
else
- it { expect(subject.dig(package1.version, dependency_type)).to be nil }
+ it { expect(subject.dig(package1.version, dependency_type)).to be_nil }
end
- it { expect(subject.dig(package2.version, dependency_type)).to be nil }
+ it { expect(subject.dig(package2.version, dependency_type)).to be_nil }
end
context 'when generate dependencies' do
@@ -88,12 +88,12 @@
context 'for metadatum' do
::Packages::Npm::GenerateMetadataService::PACKAGE_JSON_ALLOWED_FIELDS.each do |metadata_field|
if params[:has_metadatum]
- it { expect(subject.dig(package1.version, metadata_field)).not_to be nil }
+ it { expect(subject.dig(package1.version, metadata_field)).not_to be_nil }
else
- it { expect(subject.dig(package1.version, metadata_field)).to be nil }
+ it { expect(subject.dig(package1.version, metadata_field)).to be_nil }
end
- it { expect(subject.dig(package2.version, metadata_field)).to be nil }
+ it { expect(subject.dig(package2.version, metadata_field)).to be_nil }
end
end
diff --git a/spec/services/projects/create_from_template_service_spec.rb b/spec/services/projects/create_from_template_service_spec.rb
index 0d649dee0224f..da16cb3479bd8 100644
--- a/spec/services/projects/create_from_template_service_spec.rb
+++ b/spec/services/projects/create_from_template_service_spec.rb
@@ -41,11 +41,11 @@
end
it 'does not set import set import type' do
- expect(project.import_type).to be nil
+ expect(project.import_type).to be_nil
end
it 'does not set import set import source' do
- expect(project.import_source).to be nil
+ expect(project.import_source).to be_nil
end
it 'is not scheduled' do
diff --git a/spec/services/projects/enable_deploy_key_service_spec.rb b/spec/services/projects/enable_deploy_key_service_spec.rb
index 59c76a96d0742..fb588030ed5d3 100644
--- a/spec/services/projects/enable_deploy_key_service_spec.rb
+++ b/spec/services/projects/enable_deploy_key_service_spec.rb
@@ -19,7 +19,7 @@
let!(:params) { { key_id: another_key.id } }
it 'returns nil if the key cannot be added' do
- expect(service.execute).to be nil
+ expect(service.execute).to be_nil
end
end
diff --git a/spec/services/service_desk/custom_email_verifications/create_service_spec.rb b/spec/services/service_desk/custom_email_verifications/create_service_spec.rb
index f1a5f6f311dac..43ae95e80f11a 100644
--- a/spec/services/service_desk/custom_email_verifications/create_service_spec.rb
+++ b/spec/services/service_desk/custom_email_verifications/create_service_spec.rb
@@ -105,7 +105,7 @@
expect(settings.custom_email_enabled).to be false
# Because service should normally add initial verification object
- expect(settings.custom_email_verification).to be nil
+ expect(settings.custom_email_verification).to be_nil
end
context 'when user has maintainer role in project' do
diff --git a/spec/services/service_desk/custom_emails/create_service_spec.rb b/spec/services/service_desk/custom_emails/create_service_spec.rb
index a015817b380da..c4aba39e055a0 100644
--- a/spec/services/service_desk/custom_emails/create_service_spec.rb
+++ b/spec/services/service_desk/custom_emails/create_service_spec.rb
@@ -42,8 +42,8 @@
expect(response).to be_error
expect(response.message).to eq(expected_error_message)
- expect(project.service_desk_custom_email_verification).to be nil
- expect(project.service_desk_custom_email_credential).to be nil
+ expect(project.service_desk_custom_email_verification).to be_nil
+ expect(project.service_desk_custom_email_credential).to be_nil
expect(project.service_desk_setting).to have_attributes(
custom_email: nil,
custom_email_enabled: false
diff --git a/spec/services/service_desk/custom_emails/destroy_service_spec.rb b/spec/services/service_desk/custom_emails/destroy_service_spec.rb
index d77e408c31be6..cd294549bb764 100644
--- a/spec/services/service_desk/custom_emails/destroy_service_spec.rb
+++ b/spec/services/service_desk/custom_emails/destroy_service_spec.rb
@@ -35,8 +35,8 @@
response = service.execute
expect(response).to be_success
- expect(project.service_desk_custom_email_verification).to be nil
- expect(project.service_desk_custom_email_credential).to be nil
+ expect(project.service_desk_custom_email_verification).to be_nil
+ expect(project.service_desk_custom_email_credential).to be_nil
expect(project.service_desk_setting).to have_attributes(
custom_email: nil,
custom_email_enabled: false
diff --git a/spec/services/suggestions/apply_service_spec.rb b/spec/services/suggestions/apply_service_spec.rb
index 3b44fdd03b880..1f950548185b2 100644
--- a/spec/services/suggestions/apply_service_spec.rb
+++ b/spec/services/suggestions/apply_service_spec.rb
@@ -56,7 +56,7 @@ def apply(suggestions, custom_message = nil)
it 'updates suggestion applied and commit_id columns' do
expect(suggestions.map(&:applied)).to all(be false)
- expect(suggestions.map(&:commit_id)).to all(be nil)
+ expect(suggestions.map(&:commit_id)).to all(be_nil)
apply(suggestions)
diff --git a/spec/services/users/untrust_service_spec.rb b/spec/services/users/untrust_service_spec.rb
index 054cb9b82dc9b..d51abde1b5aa5 100644
--- a/spec/services/users/untrust_service_spec.rb
+++ b/spec/services/users/untrust_service_spec.rb
@@ -28,7 +28,7 @@
operation
user.reload
- expect(user.trusted_with_spam_attribute).to be nil
+ expect(user.trusted_with_spam_attribute).to be_nil
end
end
end
diff --git a/spec/services/users/upsert_credit_card_validation_service_spec.rb b/spec/services/users/upsert_credit_card_validation_service_spec.rb
index dc176989fc267..0f0b2ffe4e2c2 100644
--- a/spec/services/users/upsert_credit_card_validation_service_spec.rb
+++ b/spec/services/users/upsert_credit_card_validation_service_spec.rb
@@ -43,7 +43,7 @@
context 'successfully set credit card validation record for the user' do
context 'when user does not have credit card validation record' do
it 'creates the credit card validation and returns a success', :aggregate_failures do
- expect(user.credit_card_validated_at).to be nil
+ expect(user.credit_card_validated_at).to be_nil
service_result = service.execute
--
GitLab