diff --git a/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql index 4a46d741a7880768db2ffa267662061c80da7089..b362c8d6d52edc6f621bfbc94165e7cc0aa812c6 100644 --- a/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql +++ b/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql @@ -8,6 +8,7 @@ mutation issueMoveList( $toListId: ID $moveBeforeId: ID $moveAfterId: ID + $positionInList: Int ) { issuableMoveList: issueMoveList( input: { @@ -18,6 +19,7 @@ mutation issueMoveList( toListId: $toListId moveBeforeId: $moveBeforeId moveAfterId: $moveAfterId + positionInList: $positionInList } ) { issuable: issue { diff --git a/spec/features/boards/issue_ordering_spec.rb b/spec/features/boards/issue_ordering_spec.rb index 787d175ff30c89ca2a48563a5e40f2dbe09fb010..de7a699fa788c380adab1cb35fe1a62b207bca0f 100644 --- a/spec/features/boards/issue_ordering_spec.rb +++ b/spec/features/boards/issue_ordering_spec.rb @@ -102,7 +102,7 @@ expect(all('.board-card').last).to have_content(issue3.title) end - it 'moves from bottom to top', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546388' do + it 'moves from bottom to top' do drag(from_index: 2, to_index: 0) wait_for_requests @@ -118,7 +118,7 @@ expect(first('.board-card')).to have_content(issue2.title) end - it 'moves from bottom to middle', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546390' do + it 'moves from bottom to middle' do drag(from_index: 2, to_index: 1) wait_for_requests @@ -135,7 +135,7 @@ wait_for_requests end - it 'moves to end of list', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410100' do + it 'moves to end of list' do expect(all('.board-card').first).to have_content(issue3.title) page.within(find('[data-testid="board-list"]:nth-child(2)')) do @@ -148,7 +148,7 @@ expect(all('.board-card').last).to have_content(issue3.title) end - it 'moves to start of list', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410100' do + it 'moves to start of list' do expect(all('.board-card').last).to have_content(issue1.title) page.within(find('[data-testid="board-list"]:nth-child(2)')) do @@ -176,7 +176,7 @@ expect(page).to have_selector('.board', count: 4) end - it 'moves to top of another list', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/546391' do + it 'moves to top of another list' do drag(list_from_index: 1, list_to_index: 2) wait_for_requests