1 files changed, 10 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 0f283f1194f..2fdd0a7dd51 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -96,6 +96,8 @@ RSpec.describe 'Merge request > User resolves conflicts', :js, feature_category:
 
       before do
         visit project_merge_request_path(project, merge_request)
+
+        click_button 'Expand merge checks'
       end
 
       it 'shows a link to the conflict resolution page' do
@@ -127,6 +129,9 @@ RSpec.describe 'Merge request > User resolves conflicts', :js, feature_category:
 
       before do
         visit project_merge_request_path(project, merge_request)
+
+        click_button 'Expand merge checks'
+
         click_link('conflicts', href: %r{/conflicts\Z})
       end
 
@@ -169,6 +174,9 @@ RSpec.describe 'Merge request > User resolves conflicts', :js, feature_category:
 
       before do
         visit project_merge_request_path(project, merge_request)
+
+        click_button 'Expand merge checks'
+
         click_link('conflicts', href: %r{/conflicts\Z})
       end
 
@@ -193,6 +201,8 @@ RSpec.describe 'Merge request > User resolves conflicts', :js, feature_category:
         project.add_developer(user)
         sign_in(user)
         visit project_merge_request_path(project, merge_request)
+
+        click_button 'Expand merge checks'
       end
 
       it 'does not show a link to the conflict resolution page' do