kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed sidebar not collapsing on merge request in mobile screens

Browse source
This commit is contained in:
Jose Ivan Vargas 2017-06-27 12:35:13 -05:00
parent 6ab588665c
commit 502bd6c033
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/merge_request_tabs.js
View file

@ -144,7 +144,6 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
this.resetViewContainer();
this.mountPipelinesView();
} else {
this.expandView();
this.resetViewContainer();
this.destroyPipelinesView();
}

4
changelogs/unreleased/fix-sidebar-showing-mobile-merge-requests.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fixed sidebar not collapsing on merge requests in mobile screens
merge_request:
author:

7
spec/features/issues/issue_sidebar_spec.rb
View file

@ -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