Update endpoints to handle with board issues
This commit is contained in:
parent
e1f889df64
commit
6751509865
2 changed files with 40 additions and 17 deletions
|
@ -60,11 +60,11 @@ module Projects
|
|||
end
|
||||
|
||||
def filter_params
|
||||
params.merge(id: params[:list_id])
|
||||
params.merge(board_id: params[:board_id], id: params[:list_id])
|
||||
end
|
||||
|
||||
def move_params
|
||||
params.permit(:id, :from_list_id, :to_list_id)
|
||||
params.permit(:board_id, :id, :from_list_id, :to_list_id)
|
||||
end
|
||||
|
||||
def issue_params
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Projects::Boards::IssuesController do
|
||||
let(:project) { create(:project_with_board) }
|
||||
let(:project) { create(:empty_project) }
|
||||
let(:board) { create(:board, project: project) }
|
||||
let(:user) { create(:user) }
|
||||
let(:guest) { create(:user) }
|
||||
|
||||
let(:planning) { create(:label, project: project, name: 'Planning') }
|
||||
let(:development) { create(:label, project: project, name: 'Development') }
|
||||
|
||||
let!(:list1) { create(:list, board: project.board, label: planning, position: 0) }
|
||||
let!(:list2) { create(:list, board: project.board, label: development, position: 1) }
|
||||
let!(:list1) { create(:list, board: board, label: planning, position: 0) }
|
||||
let!(:list2) { create(:list, board: board, label: development, position: 1) }
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
|
@ -24,7 +25,7 @@ describe Projects::Boards::IssuesController do
|
|||
create(:labeled_issue, project: project, labels: [development])
|
||||
create(:labeled_issue, project: project, labels: [development], assignee: johndoe)
|
||||
|
||||
list_issues user: user, list_id: list2
|
||||
list_issues user: user, board: board, list: list2
|
||||
|
||||
parsed_response = JSON.parse(response.body)
|
||||
|
||||
|
@ -33,9 +34,17 @@ describe Projects::Boards::IssuesController do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with invalid board id' do
|
||||
it 'returns a not found 404 response' do
|
||||
list_issues user: user, board: 999, list: list2
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with invalid list id' do
|
||||
it 'returns a not found 404 response' do
|
||||
list_issues user: user, list_id: 999
|
||||
list_issues user: user, board: board, list: 999
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
|
@ -47,19 +56,20 @@ describe Projects::Boards::IssuesController do
|
|||
allow(Ability).to receive(:allowed?).with(user, :read_issue, project).and_return(false)
|
||||
end
|
||||
|
||||
it 'returns a successful 403 response' do
|
||||
list_issues user: user, list_id: list2
|
||||
it 'returns a forbidden 403 response' do
|
||||
list_issues user: user, board: board, list: list2
|
||||
|
||||
expect(response).to have_http_status(403)
|
||||
end
|
||||
end
|
||||
|
||||
def list_issues(user:, list_id:)
|
||||
def list_issues(user:, board:, list:)
|
||||
sign_in(user)
|
||||
|
||||
get :index, namespace_id: project.namespace.to_param,
|
||||
project_id: project.to_param,
|
||||
list_id: list_id.to_param
|
||||
board_id: board.to_param,
|
||||
list_id: list.to_param
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -122,13 +132,13 @@ describe Projects::Boards::IssuesController do
|
|||
|
||||
context 'with valid params' do
|
||||
it 'returns a successful 200 response' do
|
||||
move user: user, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
move user: user, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
end
|
||||
|
||||
it 'moves issue to the desired list' do
|
||||
move user: user, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
move user: user, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
|
||||
expect(issue.reload.labels).to contain_exactly(development)
|
||||
end
|
||||
|
@ -136,31 +146,44 @@ describe Projects::Boards::IssuesController do
|
|||
|
||||
context 'with invalid params' do
|
||||
it 'returns a unprocessable entity 422 response for invalid lists' do
|
||||
move user: user, issue: issue, from_list_id: nil, to_list_id: nil
|
||||
move user: user, board: board, issue: issue, from_list_id: nil, to_list_id: nil
|
||||
|
||||
expect(response).to have_http_status(422)
|
||||
end
|
||||
|
||||
it 'returns a not found 404 response for invalid board id' do
|
||||
move user: user, board: 999, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
|
||||
it 'returns a not found 404 response for invalid issue id' do
|
||||
move user: user, issue: 999, from_list_id: list1.id, to_list_id: list2.id
|
||||
move user: user, board: board, issue: 999, from_list_id: list1.id, to_list_id: list2.id
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with unauthorized user' do
|
||||
let(:guest) { create(:user) }
|
||||
|
||||
before do
|
||||
project.team << [guest, :guest]
|
||||
end
|
||||
|
||||
it 'returns a forbidden 403 response' do
|
||||
move user: guest, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
move user: guest, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
|
||||
|
||||
expect(response).to have_http_status(403)
|
||||
end
|
||||
end
|
||||
|
||||
def move(user:, issue:, from_list_id:, to_list_id:)
|
||||
def move(user:, board:, issue:, from_list_id:, to_list_id:)
|
||||
sign_in(user)
|
||||
|
||||
patch :update, namespace_id: project.namespace.to_param,
|
||||
project_id: project.to_param,
|
||||
board_id: board.to_param,
|
||||
id: issue.to_param,
|
||||
from_list_id: from_list_id,
|
||||
to_list_id: to_list_id,
|
||||
|
|
Loading…
Reference in a new issue