Fixed sidebar not collapsing on merge request in mobile screens

3 files changed, 9 insertions, 3 deletions

diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 786b6014dc6..c25d9a95d14 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
         this.resetViewContainer();
         this.mountPipelinesView();
       } else {
-        this.expandView();
         this.resetViewContainer();
         this.destroyPipelinesView();
       }
diff --git a/changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml b/changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml
new file mode 100644
index 00000000000..856990a6126
--- /dev/null
+++ b/changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed sidebar not collapsing on merge requests in mobile screens
+merge_request:
+author:
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 163bc4bb32f..cd06b5af675 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -6,6 +6,7 @@ feature 'Issue Sidebar', feature: true do
   let(:group) { create(:group, :nested) }
   let(:project) { create(:project, :public, namespace: group) }
   let(:issue) { create(:issue, project: project) }
+  let(:merge_request) { create(:merge_request, source_project: project) }
   let!(:user) { create(:user)}
   let!(:label) { create(:label, project: project, title: 'bug') }
 
@@ -158,11 +159,13 @@ feature 'Issue Sidebar', feature: true do
     before do
       project.team << [user, :developer]
       resize_screen_xs
-      visit_issue(project, issue)
     end
 
     context 'mobile sidebar' do
-      it 'collapses the sidebar for small screens' do
+      it 'collapses the sidebar for small screens on an issue/merge_request' do
+        visit_issue(project, issue)
+        expect(page).not_to have_css('aside.right-sidebar.right-sidebar-collapsed')
+        visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
         expect(page).not_to have_css('aside.right-sidebar.right-sidebar-collapsed')
       end
     end