diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 829e5b8b8ee5774bc6462800a07a44da413adcb4..c5c3111ba2775bf39be48bf4bea5a654085ccc9a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1135,9 +1135,6 @@ Rails/SaveBang: - 'spec/requests/api/issues/post_projects_issues_spec.rb' - 'spec/requests/api/jobs_spec.rb' - 'spec/requests/api/labels_spec.rb' - - 'spec/requests/api/maven_packages_spec.rb' - - 'spec/requests/api/members_spec.rb' - - 'spec/requests/api/merge_request_diffs_spec.rb' - 'spec/requests/api/merge_requests_spec.rb' - 'spec/requests/api/notes_spec.rb' - 'spec/requests/api/pipeline_schedules_spec.rb' diff --git a/changelogs/unreleased/rails-save-bang-32.yml b/changelogs/unreleased/rails-save-bang-32.yml new file mode 100644 index 0000000000000000000000000000000000000000..972920b29cc303ca6fafe649c7973d84a77664f1 --- /dev/null +++ b/changelogs/unreleased/rails-save-bang-32.yml @@ -0,0 +1,5 @@ +--- +title: Fix Rails/SaveBang offenses for 3 files +merge_request: 41398 +author: Rajendra Kadam +type: other diff --git a/spec/requests/api/maven_packages_spec.rb b/spec/requests/api/maven_packages_spec.rb index 04d1d2cf1e86d32c4dd33cb6a1c104c05e10c4fc..0a23aed109b7ff1c00c7c40264e52758b74589c3 100644 --- a/spec/requests/api/maven_packages_spec.rb +++ b/spec/requests/api/maven_packages_spec.rb @@ -283,7 +283,7 @@ def download_file_with_token(file_name, params = {}, request_headers = headers_w context 'internal project' do before do - group.group_member(user).destroy + group.group_member(user).destroy! project.update!(visibility_level: Gitlab::VisibilityLevel::INTERNAL) end diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb index 23889912d7a08cf94d83fbaad0a1a38545eaec26..de52087340c339f39b64e777d9381ef25bc0a1ba 100644 --- a/spec/requests/api/members_spec.rb +++ b/spec/requests/api/members_spec.rb @@ -258,8 +258,8 @@ it 'does not create the member if group level is higher' do parent = create(:group) - group.update(parent: parent) - project.update(group: group) + group.update!(parent: parent) + project.update!(group: group) parent.add_developer(stranger) post api("/#{source_type.pluralize}/#{source.id}/members", maintainer), @@ -272,8 +272,8 @@ it 'creates the member if group level is lower' do parent = create(:group) - group.update(parent: parent) - project.update(group: group) + group.update!(parent: parent) + project.update!(group: group) parent.add_developer(stranger) post api("/#{source_type.pluralize}/#{source.id}/members", maintainer), diff --git a/spec/requests/api/merge_request_diffs_spec.rb b/spec/requests/api/merge_request_diffs_spec.rb index 3f41a7a034df817340cf46b4ff4d1c89366167c6..2e6cbe7bee7ff77a840b50c286bd3d2bfe9ac41a 100644 --- a/spec/requests/api/merge_request_diffs_spec.rb +++ b/spec/requests/api/merge_request_diffs_spec.rb @@ -8,8 +8,8 @@ let!(:project) { merge_request.target_project } before do - merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') - merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') + merge_request.merge_request_diffs.create!(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') + merge_request.merge_request_diffs.create!(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') project.add_maintainer(user) end