From 873237b97dbcf2c622e7089e6a0e0c1ac2521507 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 4 Apr 2021 18:09:19 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_manual_todo.yml | 7 ------- changelogs/unreleased/rails-save-bang-features-admin.yml | 5 +++++ spec/features/admin/admin_appearance_spec.rb | 2 +- spec/features/admin/admin_labels_spec.rb | 4 ++-- spec/features/admin/admin_mode/login_spec.rb | 2 +- spec/features/admin/admin_runners_spec.rb | 2 +- spec/features/admin/admin_sees_project_statistics_spec.rb | 2 +- spec/features/admin/admin_sees_projects_statistics_spec.rb | 2 +- .../admin/admin_users_impersonation_tokens_spec.rb | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 changelogs/unreleased/rails-save-bang-features-admin.yml diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index ce12cfedfdb..a4957bace99 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -177,13 +177,6 @@ Rails/SaveBang: - 'spec/controllers/sent_notifications_controller_spec.rb' - 'spec/controllers/sessions_controller_spec.rb' - 'spec/factories_spec.rb' - - 'spec/features/admin/admin_appearance_spec.rb' - - 'spec/features/admin/admin_labels_spec.rb' - - 'spec/features/admin/admin_mode/login_spec.rb' - - 'spec/features/admin/admin_runners_spec.rb' - - 'spec/features/admin/admin_sees_project_statistics_spec.rb' - - 'spec/features/admin/admin_sees_projects_statistics_spec.rb' - - 'spec/features/admin/admin_users_impersonation_tokens_spec.rb' - 'spec/features/dashboard/datetime_on_tooltips_spec.rb' - 'spec/features/dashboard/issuables_counter_spec.rb' - 'spec/features/dashboard/project_member_activity_index_spec.rb' diff --git a/changelogs/unreleased/rails-save-bang-features-admin.yml b/changelogs/unreleased/rails-save-bang-features-admin.yml new file mode 100644 index 00000000000..3c1fc1d8f1a --- /dev/null +++ b/changelogs/unreleased/rails-save-bang-features-admin.yml @@ -0,0 +1,5 @@ +--- +title: Fix Rails/SaveBang rubocop offenses in spec/features/admin +merge_request: 57891 +author: Abdul Wadood @abdulwd +type: fixed diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb index cd136af8d69..61e7efbc56c 100644 --- a/spec/features/admin/admin_appearance_spec.rb +++ b/spec/features/admin/admin_appearance_spec.rb @@ -66,7 +66,7 @@ RSpec.describe 'Admin Appearance' do context 'when system header and footer messages are not empty' do before do - appearance.update(header_message: 'Foo', footer_message: 'Bar') + appearance.update!(header_message: 'Foo', footer_message: 'Bar') end it 'shows custom system header and footer fields' do diff --git a/spec/features/admin/admin_labels_spec.rb b/spec/features/admin/admin_labels_spec.rb index 815a73b1450..783d96e3b2b 100644 --- a/spec/features/admin/admin_labels_spec.rb +++ b/spec/features/admin/admin_labels_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' RSpec.describe 'admin issues labels' do - let!(:bug_label) { Label.create(title: 'bug', template: true) } - let!(:feature_label) { Label.create(title: 'feature', template: true) } + let!(:bug_label) { Label.create!(title: 'bug', template: true) } + let!(:feature_label) { Label.create!(title: 'feature', template: true) } before do admin = create(:admin) diff --git a/spec/features/admin/admin_mode/login_spec.rb b/spec/features/admin/admin_mode/login_spec.rb index f1dee075925..5b2dfdb2941 100644 --- a/spec/features/admin/admin_mode/login_spec.rb +++ b/spec/features/admin/admin_mode/login_spec.rb @@ -86,7 +86,7 @@ RSpec.describe 'Admin Mode Login' do expect(codes.size).to eq 10 # Ensure the generated codes get saved - user.save + user.save! end context 'with valid code' do diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index b225e4112d4..d83b5bb0c1f 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -355,7 +355,7 @@ RSpec.describe "Admin Runners" do let(:runner) { create(:ci_runner, :instance) } before do - @project1.destroy + @project1.destroy! visit admin_runner_path(runner) end diff --git a/spec/features/admin/admin_sees_project_statistics_spec.rb b/spec/features/admin/admin_sees_project_statistics_spec.rb index be781730924..3433cc01b8e 100644 --- a/spec/features/admin/admin_sees_project_statistics_spec.rb +++ b/spec/features/admin/admin_sees_project_statistics_spec.rb @@ -21,7 +21,7 @@ RSpec.describe "Admin > Admin sees project statistics" do end context 'when project has no statistics' do - let(:project) { create(:project, :repository) { |project| project.statistics.destroy } } + let(:project) { create(:project, :repository) { |project| project.statistics.destroy! } } it "shows 'Storage: Unknown'" do expect(page).to have_content("Storage: Unknown") diff --git a/spec/features/admin/admin_sees_projects_statistics_spec.rb b/spec/features/admin/admin_sees_projects_statistics_spec.rb index 2e96814d1e9..d340eb47f34 100644 --- a/spec/features/admin/admin_sees_projects_statistics_spec.rb +++ b/spec/features/admin/admin_sees_projects_statistics_spec.rb @@ -7,7 +7,7 @@ RSpec.describe "Admin > Admin sees projects statistics" do before do create(:project, :repository) - create(:project, :repository) { |project| project.statistics.destroy } + create(:project, :repository) { |project| project.statistics.destroy! } sign_in(current_user) gitlab_enable_admin_mode_sign_in(current_user) diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb index cae190e76b0..dc528dd92d4 100644 --- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb +++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb @@ -75,7 +75,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do end it "removes expired tokens from 'active' section" do - impersonation_token.update(expires_at: 5.days.ago) + impersonation_token.update!(expires_at: 5.days.ago) visit admin_user_impersonation_tokens_path(user_id: user.username)