1 files changed, 27 insertions, 12 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 9b4f2774c5b..db41c9b5374 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -3,30 +3,45 @@
 require 'spec_helper'
 
 RSpec.describe 'projects/merge_requests/show.html.haml' do
+  include Spec::Support::Helpers::Features::MergeRequestHelpers
+
   before do
     allow(view).to receive(:experiment_enabled?).and_return(false)
   end
 
-  include_context '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))
+  context 'when the merge request is open' do
+    include_context 'open merge request show action'
 
-        render
+    it 'shows the "Mark as draft" button' do
+      render
 
-        expect(rendered).not_to have_css('.merge-icon')
-      end
+      expect(rendered).to have_css('a', visible: true, text: 'Mark as draft')
+      expect(rendered).to have_css('a', visible: false, text: 'Reopen')
+      expect(rendered).to have_css('a', visible: true, text: 'Close')
     end
   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
+    end
+
     it 'shows the "Reopen" button' do
       render
 
+      expect(rendered).not_to have_css('a', visible: true, text: 'Mark as draft')
       expect(rendered).to have_css('a', visible: true, text: 'Reopen')
       expect(rendered).to have_css('a', visible: false, text: 'Close')
     end
@@ -34,7 +49,7 @@ RSpec.describe 'projects/merge_requests/show.html.haml' do
     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
+      preload_view_requirements(closed_merge_request, note)
 
       render