Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
67515098
Commit
67515098
authored
Oct 05, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update endpoints to handle with board issues
parent
e1f889df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
17 deletions
+40
-17
app/controllers/projects/boards/issues_controller.rb
app/controllers/projects/boards/issues_controller.rb
+2
-2
spec/controllers/projects/boards/issues_controller_spec.rb
spec/controllers/projects/boards/issues_controller_spec.rb
+38
-15
No files found.
app/controllers/projects/boards/issues_controller.rb
View file @
67515098
...
@@ -60,11 +60,11 @@ module Projects
...
@@ -60,11 +60,11 @@ module Projects
end
end
def
filter_params
def
filter_params
params
.
merge
(
id:
params
[
:list_id
])
params
.
merge
(
board_id:
params
[
:board_id
],
id:
params
[
:list_id
])
end
end
def
move_params
def
move_params
params
.
permit
(
:id
,
:from_list_id
,
:to_list_id
)
params
.
permit
(
:
board_id
,
:
id
,
:from_list_id
,
:to_list_id
)
end
end
def
issue_params
def
issue_params
...
...
spec/controllers/projects/boards/issues_controller_spec.rb
View file @
67515098
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
Boards
::
IssuesController
do
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
(
:user
)
{
create
(
:user
)
}
let
(
:guest
)
{
create
(
:user
)
}
let
(
:guest
)
{
create
(
:user
)
}
let
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
let
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
let
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let!
(
:list1
)
{
create
(
:list
,
board:
project
.
board
,
label:
planning
,
position:
0
)
}
let!
(
:list1
)
{
create
(
:list
,
board:
board
,
label:
planning
,
position:
0
)
}
let!
(
:list2
)
{
create
(
:list
,
board:
project
.
board
,
label:
development
,
position:
1
)
}
let!
(
:list2
)
{
create
(
:list
,
board:
board
,
label:
development
,
position:
1
)
}
before
do
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
...
@@ -24,7 +25,7 @@ describe Projects::Boards::IssuesController do
...
@@ -24,7 +25,7 @@ describe Projects::Boards::IssuesController do
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
])
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
])
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
],
assignee:
johndoe
)
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
)
parsed_response
=
JSON
.
parse
(
response
.
body
)
...
@@ -33,9 +34,17 @@ describe Projects::Boards::IssuesController do
...
@@ -33,9 +34,17 @@ describe Projects::Boards::IssuesController do
end
end
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
context
'with invalid list id'
do
it
'returns a not found 404 response'
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
)
expect
(
response
).
to
have_http_status
(
404
)
end
end
...
@@ -47,19 +56,20 @@ describe Projects::Boards::IssuesController do
...
@@ -47,19 +56,20 @@ describe Projects::Boards::IssuesController do
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_issue
,
project
).
and_return
(
false
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_issue
,
project
).
and_return
(
false
)
end
end
it
'returns a
successful
403 response'
do
it
'returns a
forbidden
403 response'
do
list_issues
user:
user
,
list_id
:
list2
list_issues
user:
user
,
board:
board
,
list
:
list2
expect
(
response
).
to
have_http_status
(
403
)
expect
(
response
).
to
have_http_status
(
403
)
end
end
end
end
def
list_issues
(
user
:,
list_id
:)
def
list_issues
(
user
:,
board
:,
list
:)
sign_in
(
user
)
sign_in
(
user
)
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
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
end
end
...
@@ -122,13 +132,13 @@ describe Projects::Boards::IssuesController do
...
@@ -122,13 +132,13 @@ describe Projects::Boards::IssuesController do
context
'with valid params'
do
context
'with valid params'
do
it
'returns a successful 200 response'
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
)
expect
(
response
).
to
have_http_status
(
200
)
end
end
it
'moves issue to the desired list'
do
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
)
expect
(
issue
.
reload
.
labels
).
to
contain_exactly
(
development
)
end
end
...
@@ -136,31 +146,44 @@ describe Projects::Boards::IssuesController do
...
@@ -136,31 +146,44 @@ describe Projects::Boards::IssuesController do
context
'with invalid params'
do
context
'with invalid params'
do
it
'returns a unprocessable entity 422 response for invalid lists'
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
)
expect
(
response
).
to
have_http_status
(
422
)
end
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
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
)
expect
(
response
).
to
have_http_status
(
404
)
end
end
end
end
context
'with unauthorized user'
do
context
'with unauthorized user'
do
let
(
:guest
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
guest
,
:guest
]
end
it
'returns a forbidden 403 response'
do
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
)
expect
(
response
).
to
have_http_status
(
403
)
end
end
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
)
sign_in
(
user
)
patch
:update
,
namespace_id:
project
.
namespace
.
to_param
,
patch
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
project_id:
project
.
to_param
,
board_id:
board
.
to_param
,
id:
issue
.
to_param
,
id:
issue
.
to_param
,
from_list_id:
from_list_id
,
from_list_id:
from_list_id
,
to_list_id:
to_list_id
,
to_list_id:
to_list_id
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment