1 files changed, 10 insertions, 6 deletions

diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb
index a145bcb976b..1f4682b4a46 100644
--- a/spec/features/merge_request/user_views_open_merge_request_spec.rb
+++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb
@@ -71,13 +71,14 @@ RSpec.describe 'User views an open merge request' do
       let(:merge_request) { create(:merge_request, :rebased, source_project: project, target_project: project) }
 
       before do
+        project.add_maintainer(project.creator)
+        sign_in(project.creator)
+
         visit(merge_request_path(merge_request))
       end
 
       it 'does not show diverged commits count' do
-        page.within('.mr-source-target') do
-          expect(page).not_to have_content(/([0-9]+ commits? behind)/)
-        end
+        expect(page).not_to have_content(/([0-9]+ commits? behind)/)
       end
     end
 
@@ -85,13 +86,14 @@ RSpec.describe 'User views an open merge request' do
       let(:merge_request) { create(:merge_request, :diverged, source_project: project, target_project: project) }
 
       before do
+        project.add_maintainer(project.creator)
+        sign_in(project.creator)
+
         visit(merge_request_path(merge_request))
       end
 
       it 'shows diverged commits count' do
-        page.within('.mr-source-target') do
-          expect(page).to have_content(/([0-9]+ commits behind)/)
-        end
+        expect(page).not_to have_content(/([0-9]+ commits? behind)/)
       end
     end
 
@@ -117,6 +119,8 @@ RSpec.describe 'User views an open merge request' do
     let(:source_branch) { "'><iframe/srcdoc=''></iframe>" }
 
     before do
+      stub_feature_flags(moved_mr_sidebar: false)
+
       project.repository.create_branch(source_branch, "master")
 
       mr = create(:merge_request, source_project: project, target_project: project, source_branch: source_branch)