diff options
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index c7d26dfc814..93fea44707c 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -127,8 +127,10 @@ RSpec.describe 'Merge request > User sees merge widget', :js do end end - context 'when merge request is in the blocked pipeline state' do + context 'when merge request is in the blocked pipeline state and pipeline must succeed' do before do + project.update_attribute(:only_allow_merge_if_pipeline_succeeds, true) + create( :ci_pipeline, project: project, |