Commit b4acc814 authored by Suraj's avatar Suraj

Fixed offenses in spec/models/* part 5

Changelog: fixed
parent 2ae25491
...@@ -165,10 +165,6 @@ Rails/SaveBang: ...@@ -165,10 +165,6 @@ Rails/SaveBang:
- 'spec/models/group_spec.rb' - 'spec/models/group_spec.rb'
- 'spec/models/identity_spec.rb' - 'spec/models/identity_spec.rb'
- 'spec/models/jira_import_state_spec.rb' - 'spec/models/jira_import_state_spec.rb'
- 'spec/models/key_spec.rb'
- 'spec/models/lfs_objects_project_spec.rb'
- 'spec/models/merge_request_spec.rb'
- 'spec/models/milestone_spec.rb'
- 'spec/models/namespace_spec.rb' - 'spec/models/namespace_spec.rb'
- 'spec/models/note_spec.rb' - 'spec/models/note_spec.rb'
- 'spec/models/notification_setting_spec.rb' - 'spec/models/notification_setting_spec.rb'
......
...@@ -139,7 +139,7 @@ RSpec.describe Key, :mailer do ...@@ -139,7 +139,7 @@ RSpec.describe Key, :mailer do
end end
with_them do with_them do
let!(:key) { create(factory) } let!(:key) { create(factory) } # rubocop:disable Rails/SaveBang
let!(:original_fingerprint) { key.fingerprint } let!(:original_fingerprint) { key.fingerprint }
let!(:original_fingerprint_sha256) { key.fingerprint_sha256 } let!(:original_fingerprint_sha256) { key.fingerprint_sha256 }
...@@ -224,7 +224,7 @@ RSpec.describe Key, :mailer do ...@@ -224,7 +224,7 @@ RSpec.describe Key, :mailer do
expect(AuthorizedKeysWorker).to receive(:perform_async).with(:remove_key, key.shell_id) expect(AuthorizedKeysWorker).to receive(:perform_async).with(:remove_key, key.shell_id)
key.destroy key.destroy!
end end
end end
...@@ -244,7 +244,7 @@ RSpec.describe Key, :mailer do ...@@ -244,7 +244,7 @@ RSpec.describe Key, :mailer do
expect(AuthorizedKeysWorker).not_to receive(:perform_async) expect(AuthorizedKeysWorker).not_to receive(:perform_async)
key.destroy key.destroy!
end end
end end
end end
......
...@@ -39,7 +39,7 @@ RSpec.describe LfsObjectsProject do ...@@ -39,7 +39,7 @@ RSpec.describe LfsObjectsProject do
expect(ProjectCacheWorker).to receive(:perform_async) expect(ProjectCacheWorker).to receive(:perform_async)
.with(project.id, [], [:lfs_objects_size]) .with(project.id, [], [:lfs_objects_size])
subject.destroy subject.destroy!
end end
end end
end end
...@@ -296,7 +296,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -296,7 +296,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
end end
it 'does not create duplicated metrics records when MR is concurrently updated' do it 'does not create duplicated metrics records when MR is concurrently updated' do
merge_request.metrics.destroy merge_request.metrics.destroy!
instance1 = MergeRequest.find(merge_request.id) instance1 = MergeRequest.find(merge_request.id)
instance2 = MergeRequest.find(merge_request.id) instance2 = MergeRequest.find(merge_request.id)
...@@ -347,7 +347,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -347,7 +347,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' } let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
it 'returns empty requests' do it 'returns empty requests' do
latest_merge_request_diff = merge_request.merge_request_diffs.create latest_merge_request_diff = merge_request.merge_request_diffs.create!
MergeRequestDiffCommit.where( MergeRequestDiffCommit.where(
merge_request_diff_id: latest_merge_request_diff, merge_request_diff_id: latest_merge_request_diff,
...@@ -459,7 +459,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -459,7 +459,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
} }
create(:merge_request, params).tap do |mr| create(:merge_request, params).tap do |mr|
diffs.times { mr.merge_request_diffs.create } diffs.times { mr.merge_request_diffs.create! }
mr.create_merge_head_diff mr.create_merge_head_diff
end end
end end
...@@ -891,7 +891,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -891,7 +891,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'when there are MR diffs' do context 'when there are MR diffs' do
it 'delegates to the MR diffs' do it 'delegates to the MR diffs' do
merge_request.save merge_request.save!
expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(hash_including(options)).and_call_original expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(hash_including(options)).and_call_original
...@@ -1036,20 +1036,20 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -1036,20 +1036,20 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'when there are MR diffs' do context 'when there are MR diffs' do
it 'returns the correct count' do it 'returns the correct count' do
merge_request.save merge_request.save!
expect(merge_request.diff_size).to eq('105') expect(merge_request.diff_size).to eq('105')
end end
it 'returns the correct overflow count' do it 'returns the correct overflow count' do
allow(Commit).to receive(:max_diff_options).and_return(max_files: 2) allow(Commit).to receive(:max_diff_options).and_return(max_files: 2)
merge_request.save merge_request.save!
expect(merge_request.diff_size).to eq('2+') expect(merge_request.diff_size).to eq('2+')
end end
it 'does not perform highlighting' do it 'does not perform highlighting' do
merge_request.save merge_request.save!
expect(Gitlab::Diff::Highlight).not_to receive(:new) expect(Gitlab::Diff::Highlight).not_to receive(:new)
...@@ -1470,7 +1470,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -1470,7 +1470,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
end end
it "can't remove a root ref" do it "can't remove a root ref" do
subject.update(source_branch: 'master', target_branch: 'feature') subject.update!(source_branch: 'master', target_branch: 'feature')
expect(subject.can_remove_source_branch?(user)).to be_falsey expect(subject.can_remove_source_branch?(user)).to be_falsey
end end
...@@ -2501,7 +2501,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -2501,7 +2501,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'with a completely different branch' do context 'with a completely different branch' do
before do before do
subject.update(target_branch: 'csv') subject.update!(target_branch: 'csv')
end end
it_behaves_like 'returning all SHA' it_behaves_like 'returning all SHA'
...@@ -2509,7 +2509,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -2509,7 +2509,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'with a branch having no difference' do context 'with a branch having no difference' do
before do before do
subject.update(target_branch: 'branch-merged') subject.update!(target_branch: 'branch-merged')
subject.reload # make sure commits were not cached subject.reload # make sure commits were not cached
end end
...@@ -3207,7 +3207,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -3207,7 +3207,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'and a failed pipeline is associated' do context 'and a failed pipeline is associated' do
before do before do
pipeline.update(status: 'failed', sha: subject.diff_head_sha) pipeline.update!(status: 'failed', sha: subject.diff_head_sha)
allow(subject).to receive(:head_pipeline) { pipeline } allow(subject).to receive(:head_pipeline) { pipeline }
end end
...@@ -3216,7 +3216,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -3216,7 +3216,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'and a successful pipeline is associated' do context 'and a successful pipeline is associated' do
before do before do
pipeline.update(status: 'success', sha: subject.diff_head_sha) pipeline.update!(status: 'success', sha: subject.diff_head_sha)
allow(subject).to receive(:head_pipeline) { pipeline } allow(subject).to receive(:head_pipeline) { pipeline }
end end
...@@ -3225,7 +3225,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -3225,7 +3225,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
context 'and a skipped pipeline is associated' do context 'and a skipped pipeline is associated' do
before do before do
pipeline.update(status: 'skipped', sha: subject.diff_head_sha) pipeline.update!(status: 'skipped', sha: subject.diff_head_sha)
allow(subject).to receive(:head_pipeline).and_return(pipeline) allow(subject).to receive(:head_pipeline).and_return(pipeline)
end end
...@@ -3530,7 +3530,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -3530,7 +3530,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
before do before do
# Update merge_request_diff so that #diff_refs will return commit.diff_refs # Update merge_request_diff so that #diff_refs will return commit.diff_refs
allow(subject).to receive(:create_merge_request_diff) do allow(subject).to receive(:create_merge_request_diff) do
subject.merge_request_diffs.create( subject.merge_request_diffs.create!(
base_commit_sha: commit.parent_id, base_commit_sha: commit.parent_id,
start_commit_sha: commit.parent_id, start_commit_sha: commit.parent_id,
head_commit_sha: commit.sha head_commit_sha: commit.sha
...@@ -3800,7 +3800,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -3800,7 +3800,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
end end
it 'returns false if the merge request is merged' do it 'returns false if the merge request is merged' do
merge_request.update(state: 'merged') merge_request.update!(state: 'merged')
expect(merge_request.reload.reopenable?).to be_falsey expect(merge_request.reload.reopenable?).to be_falsey
end end
...@@ -4029,9 +4029,9 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -4029,9 +4029,9 @@ RSpec.describe MergeRequest, factory_default: :keep do
subject { create(:merge_request, importing: true, source_project: project) } subject { create(:merge_request, importing: true, source_project: project) }
let!(:merge_request_diff1) { subject.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') } let!(:merge_request_diff1) { subject.merge_request_diffs.create!(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
let!(:merge_request_diff2) { subject.merge_request_diffs.create(head_commit_sha: nil) } let!(:merge_request_diff2) { subject.merge_request_diffs.create!(head_commit_sha: nil) }
let!(:merge_request_diff3) { subject.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') } let!(:merge_request_diff3) { subject.merge_request_diffs.create!(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
context 'with diff refs' do context 'with diff refs' do
it 'returns the diffs' do it 'returns the diffs' do
...@@ -4062,9 +4062,9 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -4062,9 +4062,9 @@ RSpec.describe MergeRequest, factory_default: :keep do
subject { create(:merge_request, importing: true, source_project: project) } subject { create(:merge_request, importing: true, source_project: project) }
let!(:merge_request_diff1) { subject.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') } let!(:merge_request_diff1) { subject.merge_request_diffs.create!(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
let!(:merge_request_diff2) { subject.merge_request_diffs.create(head_commit_sha: nil) } let!(:merge_request_diff2) { subject.merge_request_diffs.create!(head_commit_sha: nil) }
let!(:merge_request_diff3) { subject.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') } let!(:merge_request_diff3) { subject.merge_request_diffs.create!(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
context 'when the diff refs are for an older merge request version' do context 'when the diff refs are for an older merge request version' do
let(:diff_refs) { merge_request_diff1.diff_refs } let(:diff_refs) { merge_request_diff1.diff_refs }
...@@ -4108,7 +4108,7 @@ RSpec.describe MergeRequest, factory_default: :keep do ...@@ -4108,7 +4108,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
it 'refreshes the number of open merge requests of the target project' do it 'refreshes the number of open merge requests of the target project' do
project = subject.target_project project = subject.target_project
expect { subject.destroy } expect { subject.destroy! }
.to change { project.open_merge_requests_count }.from(1).to(0) .to change { project.open_merge_requests_count }.from(1).to(0)
end end
end end
......
...@@ -158,7 +158,7 @@ RSpec.describe Milestone do ...@@ -158,7 +158,7 @@ RSpec.describe Milestone do
it 'returns false if milestone active and not all nested issues closed' do it 'returns false if milestone active and not all nested issues closed' do
issue.milestone = milestone issue.milestone = milestone
issue.save issue.save!
expect(milestone.can_be_closed?).to be_falsey expect(milestone.can_be_closed?).to be_falsey
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment