Commit 502bd6c0 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Fixed sidebar not collapsing on merge request in mobile screens

parent 6ab58866
...@@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion'; ...@@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
this.resetViewContainer(); this.resetViewContainer();
this.mountPipelinesView(); this.mountPipelinesView();
} else { } else {
this.expandView();
this.resetViewContainer(); this.resetViewContainer();
this.destroyPipelinesView(); this.destroyPipelinesView();
} }
......
---
title: Fixed sidebar not collapsing on merge requests in mobile screens
merge_request:
author:
...@@ -6,6 +6,7 @@ feature 'Issue Sidebar', feature: true do ...@@ -6,6 +6,7 @@ feature 'Issue Sidebar', feature: true do
let(:group) { create(:group, :nested) } let(:group) { create(:group, :nested) }
let(:project) { create(:project, :public, namespace: group) } let(:project) { create(:project, :public, namespace: group) }
let(:issue) { create(:issue, project: project) } let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:user) { create(:user)} let!(:user) { create(:user)}
let!(:label) { create(:label, project: project, title: 'bug') } let!(:label) { create(:label, project: project, title: 'bug') }
...@@ -158,11 +159,13 @@ feature 'Issue Sidebar', feature: true do ...@@ -158,11 +159,13 @@ feature 'Issue Sidebar', feature: true do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
resize_screen_xs resize_screen_xs
visit_issue(project, issue)
end end
context 'mobile sidebar' do 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') expect(page).not_to have_css('aside.right-sidebar.right-sidebar-collapsed')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment