1 files changed, 12 insertions, 26 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index db41c9b5374..40d11342ec4 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -2,16 +2,14 @@
 
 require 'spec_helper'
 
-RSpec.describe 'projects/merge_requests/show.html.haml' do
-  include Spec::Support::Helpers::Features::MergeRequestHelpers
+RSpec.describe 'projects/merge_requests/show.html.haml', :aggregate_failures do
+  include_context 'merge request show action'
 
   before do
-    allow(view).to receive(:experiment_enabled?).and_return(false)
+    merge_request.reload
   end
 
   context 'when the merge request is open' do
-    include_context 'open merge request show action'
-
     it 'shows the "Mark as draft" button' do
       render
 
@@ -22,20 +20,8 @@ RSpec.describe 'projects/merge_requests/show.html.haml' do
   end
 
   context 'when the merge request is closed' do
-    include_context 'closed merge request show action'
-
-    describe 'merge request assignee sidebar' do
-      context 'when assignee is allowed to merge' do
-        it 'does not show a warning icon' do
-          closed_merge_request.update!(assignee_id: user.id)
-          project.add_maintainer(user)
-          assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
-
-          render
-
-          expect(rendered).not_to have_css('.merge-icon')
-        end
-      end
+    before do
+      merge_request.close!
     end
 
     it 'shows the "Reopen" button' do
@@ -46,15 +32,15 @@ RSpec.describe 'projects/merge_requests/show.html.haml' do
       expect(rendered).to have_css('a', visible: false, text: 'Close')
     end
 
-    it 'does not show the "Reopen" button when the source project does not exist' do
-      unlink_project.execute
-      closed_merge_request.reload
-      preload_view_requirements(closed_merge_request, note)
+    context 'when source project does not exist' do
+      it 'does not show the "Reopen" button' do
+        allow(merge_request).to receive(:source_project).and_return(nil)
 
-      render
+        render
 
-      expect(rendered).to have_css('a', visible: false, text: 'Reopen')
-      expect(rendered).to have_css('a', visible: false, text: 'Close')
+        expect(rendered).to have_css('a', visible: false, text: 'Reopen')
+        expect(rendered).to have_css('a', visible: false, text: 'Close')
+      end
     end
   end
 end