Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
ab032f621c
commit
14a2a7de8e
|
|
@ -178,9 +178,6 @@ Rails/SaveBang:
|
|||
- 'spec/controllers/groups/runners_controller_spec.rb'
|
||||
- 'spec/controllers/groups/uploads_controller_spec.rb'
|
||||
- 'spec/controllers/groups_controller_spec.rb'
|
||||
- 'spec/controllers/profiles/emails_controller_spec.rb'
|
||||
- 'spec/controllers/profiles/notifications_controller_spec.rb'
|
||||
- 'spec/controllers/projects_controller_spec.rb'
|
||||
- 'spec/controllers/sent_notifications_controller_spec.rb'
|
||||
- 'spec/controllers/sessions_controller_spec.rb'
|
||||
- 'spec/factories_spec.rb'
|
||||
|
|
@ -205,22 +202,6 @@ Rails/SaveBang:
|
|||
- 'spec/features/issues/user_filters_issues_spec.rb'
|
||||
- 'spec/features/issues/user_sees_live_update_spec.rb'
|
||||
- 'spec/features/issues/user_sorts_issues_spec.rb'
|
||||
- 'spec/features/projects/features_visibility_spec.rb'
|
||||
- 'spec/features/projects/fork_spec.rb'
|
||||
- 'spec/features/projects/jobs_spec.rb'
|
||||
- 'spec/features/projects/members/user_requests_access_spec.rb'
|
||||
- 'spec/features/projects/pages_lets_encrypt_spec.rb'
|
||||
- 'spec/features/projects/pages_spec.rb'
|
||||
- 'spec/features/projects/pipelines/pipeline_spec.rb'
|
||||
- 'spec/features/projects/pipelines/pipelines_spec.rb'
|
||||
- 'spec/features/projects/remote_mirror_spec.rb'
|
||||
- 'spec/features/projects/services/user_activates_slack_notifications_spec.rb'
|
||||
- 'spec/features/projects/settings/access_tokens_spec.rb'
|
||||
- 'spec/features/projects/show/user_sees_deletion_failure_message_spec.rb'
|
||||
- 'spec/features/projects/user_sees_sidebar_spec.rb'
|
||||
- 'spec/features/projects/wiki/user_updates_wiki_page_spec.rb'
|
||||
- 'spec/features/projects/wiki/user_views_wiki_page_spec.rb'
|
||||
- 'spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb'
|
||||
- 'spec/frontend/fixtures/issues.rb'
|
||||
- 'spec/frontend/fixtures/merge_requests.rb'
|
||||
- 'spec/graphql/mutations/merge_requests/set_locked_spec.rb'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix Rails/SaveBang rubocop offenses in spec/features/projects
|
||||
merge_request: 57904
|
||||
author: Abdul Wadood @abdulwd
|
||||
type: fixed
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix Rails/SaveBang rubocop offenses in profiles & projects controllers
|
||||
merge_request: 57890
|
||||
author: Abdul Wadood @abdulwd
|
||||
type: fixed
|
||||
|
|
@ -5,8 +5,8 @@ require 'spec_helper'
|
|||
RSpec.describe Profiles::NotificationsController do
|
||||
let(:user) do
|
||||
create(:user) do |user|
|
||||
user.emails.create(email: 'original@example.com', confirmed_at: Time.current)
|
||||
user.emails.create(email: 'new@example.com', confirmed_at: Time.current)
|
||||
user.emails.create!(email: 'original@example.com', confirmed_at: Time.current)
|
||||
user.emails.create!(email: 'new@example.com', confirmed_at: Time.current)
|
||||
user.notification_email = 'original@example.com'
|
||||
user.save!
|
||||
end
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ RSpec.describe ProjectsController do
|
|||
before do
|
||||
setting = user.notification_settings_for(public_project)
|
||||
setting.level = :watch
|
||||
setting.save
|
||||
setting.save!
|
||||
end
|
||||
|
||||
it "shows current notification setting" do
|
||||
|
|
@ -237,7 +237,7 @@ RSpec.describe ProjectsController do
|
|||
User.project_views.keys.each do |project_view|
|
||||
context "with #{project_view} view set" do
|
||||
before do
|
||||
user.update(project_view: project_view)
|
||||
user.update!(project_view: project_view)
|
||||
|
||||
get :show, params: { namespace_id: empty_project.namespace, id: empty_project }
|
||||
end
|
||||
|
|
@ -260,7 +260,7 @@ RSpec.describe ProjectsController do
|
|||
User.project_views.keys.each do |project_view|
|
||||
context "with #{project_view} view set" do
|
||||
before do
|
||||
user.update(project_view: project_view)
|
||||
user.update!(project_view: project_view)
|
||||
|
||||
get :show, params: { namespace_id: empty_project.namespace, id: empty_project }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ RSpec.describe 'Edit Project Settings' do
|
|||
it 'renders 200 if user is member of group' do
|
||||
group = create(:group)
|
||||
project.group = group
|
||||
project.save
|
||||
project.save!
|
||||
|
||||
group.add_owner(member)
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ RSpec.describe 'Project fork' do
|
|||
let(:forking_access_level) { ProjectFeature::PRIVATE }
|
||||
|
||||
before do
|
||||
project.update(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
|
||||
project.update!(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
|
||||
end
|
||||
|
||||
context 'user is not a team member' do
|
||||
|
|
|
|||
|
|
@ -1057,7 +1057,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
|
|||
before do
|
||||
job.run!
|
||||
job.cancel!
|
||||
project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
|
||||
project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
|
||||
|
||||
sign_out(:user)
|
||||
sign_in(create(:user))
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ RSpec.describe 'Projects > Members > User requests access', :js do
|
|||
end
|
||||
|
||||
it 'request access feature is disabled' do
|
||||
project.update(request_access_enabled: false)
|
||||
project.update!(request_access_enabled: false)
|
||||
visit project_path(project)
|
||||
|
||||
expect(page).not_to have_content 'Request Access'
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ RSpec.describe 'Pipeline', :js do
|
|||
end
|
||||
|
||||
before do
|
||||
pipeline.update(user: user)
|
||||
pipeline.update!(user: user)
|
||||
end
|
||||
|
||||
it 'shows the pipeline information' do
|
||||
|
|
@ -628,7 +628,7 @@ RSpec.describe 'Pipeline', :js do
|
|||
|
||||
context 'when user does not have access to read jobs' do
|
||||
before do
|
||||
project.update(public_builds: false)
|
||||
project.update!(public_builds: false)
|
||||
end
|
||||
|
||||
describe 'GET /:project/-/pipelines/:id' do
|
||||
|
|
@ -1185,7 +1185,7 @@ RSpec.describe 'Pipeline', :js do
|
|||
let(:role) { :guest }
|
||||
|
||||
before do
|
||||
project.update(public_builds: false)
|
||||
project.update!(public_builds: false)
|
||||
end
|
||||
|
||||
context 'when accessing failed jobs page' do
|
||||
|
|
|
|||
|
|
@ -768,7 +768,7 @@ RSpec.describe 'Pipelines', :js do
|
|||
describe 'user clicks the button' do
|
||||
context 'when project already has jobs_cache_index' do
|
||||
before do
|
||||
project.update(jobs_cache_index: 1)
|
||||
project.update!(jobs_cache_index: 1)
|
||||
end
|
||||
|
||||
it 'increments jobs_cache_index' do
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ RSpec.describe 'Project remote mirror', :feature do
|
|||
|
||||
context 'when last_error is present but last_update_at is not' do
|
||||
it 'renders error message without timstamp' do
|
||||
remote_mirror.update(last_error: 'Some new error', last_update_at: nil)
|
||||
remote_mirror.update!(last_error: 'Some new error', last_update_at: nil)
|
||||
|
||||
visit project_mirror_path(project)
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ RSpec.describe 'Project remote mirror', :feature do
|
|||
|
||||
context 'when last_error and last_update_at are present' do
|
||||
it 'renders error message with timestamp' do
|
||||
remote_mirror.update(last_error: 'Some new error', last_update_at: Time.now - 5.minutes)
|
||||
remote_mirror.update!(last_error: 'Some new error', last_update_at: Time.now - 5.minutes)
|
||||
|
||||
visit project_mirror_path(project)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ RSpec.describe 'User activates Slack notifications', :js do
|
|||
|
||||
before do
|
||||
service.fields
|
||||
service.update(
|
||||
service.update!(
|
||||
push_channel: 1,
|
||||
issue_channel: 2,
|
||||
merge_request_channel: 3,
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
|
|||
end
|
||||
|
||||
it 'removes expired tokens from active section' do
|
||||
project_access_token.update(expires_at: 5.days.ago)
|
||||
project_access_token.update!(expires_at: 5.days.ago)
|
||||
visit project_settings_access_tokens_path(project)
|
||||
|
||||
expect(page).to have_selector('.settings-message')
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ RSpec.describe 'Projects > Show > User sees a deletion failure message' do
|
|||
end
|
||||
|
||||
it 'shows error message if deletion for project fails' do
|
||||
project.update(delete_error: "Something went wrong", pending_delete: false)
|
||||
project.update!(delete_error: "Something went wrong", pending_delete: false)
|
||||
|
||||
visit project_path(project)
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ RSpec.describe 'Projects > User sees sidebar' do
|
|||
|
||||
it 'shows build tab if builds are public' do
|
||||
project.public_builds = true
|
||||
project.save
|
||||
project.save!
|
||||
|
||||
visit project_path(project)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue