diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 18:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 18:09:10 +0300 |
commit | 6997e3f3d0a714bc67df268989fb089c943330cc (patch) | |
tree | 3749fb3865297df1689624b071d5d80e7783471b /spec/features/merge_request | |
parent | 7ad82cd5d78a4d2c53512cbd1c2584be753f3646 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r-- | spec/features/merge_request/user_posts_diff_notes_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/merge_request/user_sees_deployment_widget_spec.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index 64715f9234a..54eba13da49 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -20,6 +20,7 @@ RSpec.describe 'Merge request > User posts diff notes', :js do project.add_developer(user) sign_in(user) stub_feature_flags(bootstrap_confirmation_modals: false) + stub_const('Gitlab::QueryLimiting::Transaction::THRESHOLD', 104) end context 'when hovering over a parallel view diff file' do diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb index 01cc58777ba..9f1f0d97b09 100644 --- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb +++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb @@ -109,7 +109,10 @@ RSpec.describe 'Merge request > User sees deployment widget', :js do end context 'with stop action' do - let(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') } + let(:manual) do + create(:ci_build, :manual, pipeline: pipeline, + name: 'close_app', environment: environment.name) + end before do stub_feature_flags(bootstrap_confirmation_modals: false) |