Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'
Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
This commit is contained in:
commit
8900bd9d26
|
@ -144,7 +144,9 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
|
|||
this.resetViewContainer();
|
||||
this.mountPipelinesView();
|
||||
} else {
|
||||
this.expandView();
|
||||
if (Breakpoints.get().getBreakpointSize() !== 'xs') {
|
||||
this.expandView();
|
||||
}
|
||||
this.resetViewContainer();
|
||||
this.destroyPipelinesView();
|
||||
}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fixed sidebar not collapsing on merge requests in mobile screens
|
||||
merge_request:
|
||||
author:
|
|
@ -0,0 +1,30 @@
|
|||
require 'rails_helper'
|
||||
|
||||
describe 'Issue Sidebar on Mobile' do
|
||||
include MobileHelpers
|
||||
|
||||
let(:project) { create(:project, :public) }
|
||||
let(:merge_request) { create(:merge_request, source_project: project) }
|
||||
let(:issue) { create(:issue, project: project) }
|
||||
let!(:user) { create(:user)}
|
||||
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'mobile sidebar on merge requests', js: true do
|
||||
before do
|
||||
visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
|
||||
end
|
||||
|
||||
it_behaves_like "issue sidebar stays collapsed on mobile"
|
||||
end
|
||||
|
||||
context 'mobile sidebar on issues', js: true do
|
||||
before do
|
||||
visit namespace_project_issue_path(project.namespace, project, issue)
|
||||
end
|
||||
|
||||
it_behaves_like "issue sidebar stays collapsed on mobile"
|
||||
end
|
||||
end
|
|
@ -154,20 +154,6 @@ feature 'Issue Sidebar', feature: true do
|
|||
end
|
||||
end
|
||||
|
||||
context 'as a allowed mobile user', js: 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
|
||||
expect(page).not_to have_css('aside.right-sidebar.right-sidebar-collapsed')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'as a guest' do
|
||||
before do
|
||||
project.team << [user, :guest]
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
shared_examples 'issue sidebar stays collapsed on mobile' do
|
||||
before do
|
||||
resize_screen_xs
|
||||
end
|
||||
|
||||
it 'keeps the sidebar collapsed' do
|
||||
expect(page).not_to have_css('.right-sidebar.right-sidebar-collapsed')
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue