Merge branch 'rj-fix-manual-order' into 'master'
Don't let logged out user do manual order See merge request gitlab-org/gitlab-ce!30264
This commit is contained in:
commit
ae7a439758
3 changed files with 25 additions and 1 deletions
|
@ -21,7 +21,7 @@ const updateIssue = (url, issueList, { move_before_id, move_after_id }) =>
|
|||
const initManualOrdering = () => {
|
||||
const issueList = document.querySelector('.manual-ordering');
|
||||
|
||||
if (!issueList || !(gon.features && gon.features.manualSorting)) {
|
||||
if (!issueList || !(gon.features && gon.features.manualSorting) || !(gon.current_user_id > 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
5
changelogs/unreleased/rj-fix-manual-order.yml
Normal file
5
changelogs/unreleased/rj-fix-manual-order.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Don't let logged out user do manual order
|
||||
merge_request: 30264
|
||||
author:
|
||||
type: fixed
|
|
@ -150,6 +150,25 @@ describe 'Group issues page' do
|
|||
check_issue_order
|
||||
end
|
||||
|
||||
it 'issues should not be draggable when user is not logged in', :js do
|
||||
sign_out(user_in_group)
|
||||
|
||||
visit issues_group_path(group, sort: 'relative_position')
|
||||
|
||||
drag_to(selector: '.manual-ordering',
|
||||
from_index: 0,
|
||||
to_index: 2)
|
||||
|
||||
wait_for_requests
|
||||
|
||||
# Issue order should remain the same
|
||||
page.within('.manual-ordering') do
|
||||
expect(find('.issue:nth-child(1) .title')).to have_content('Issue #1')
|
||||
expect(find('.issue:nth-child(2) .title')).to have_content('Issue #2')
|
||||
expect(find('.issue:nth-child(3) .title')).to have_content('Issue #3')
|
||||
end
|
||||
end
|
||||
|
||||
def check_issue_order
|
||||
page.within('.manual-ordering') do
|
||||
expect(find('.issue:nth-child(1) .title')).to have_content('Issue #2')
|
||||
|
|
Loading…
Reference in a new issue