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
Tatuya Kamada
gitlab-ce
Commits
7475f9d1
Commit
7475f9d1
authored
Jun 30, 2016
by
Z.J. van de Weg
Committed by
Fatih Acet
Sep 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API support for Award Emoji on Snippets
parent
25004cbc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
16 deletions
+71
-16
CHANGELOG
CHANGELOG
+1
-1
lib/api/award_emoji.rb
lib/api/award_emoji.rb
+20
-10
spec/requests/api/award_emoji_spec.rb
spec/requests/api/award_emoji_spec.rb
+50
-5
No files found.
CHANGELOG
View file @
7475f9d1
...
@@ -281,6 +281,7 @@ v 8.11.0
...
@@ -281,6 +281,7 @@ v 8.11.0
- Clean up unused routes (Josef Strzibny)
- Clean up unused routes (Josef Strzibny)
- Fix issue on empty project to allow developers to only push to protected branches if given permission
- Fix issue on empty project to allow developers to only push to protected branches if given permission
- API: Add enpoints for pipelines
- API: Add enpoints for pipelines
- Emoji can be awarded on Snippets !4456
- Add green outline to New Branch button. !5447 (winniehell)
- Add green outline to New Branch button. !5447 (winniehell)
- Optimize generating of cache keys for issues and notes
- Optimize generating of cache keys for issues and notes
- Fix repository push email formatting in Outlook
- Fix repository push email formatting in Outlook
...
@@ -508,7 +509,6 @@ v 8.10.0
...
@@ -508,7 +509,6 @@ v 8.10.0
- Updated project header design
- Updated project header design
- Issuable collapsed assignee tooltip is now the users name
- Issuable collapsed assignee tooltip is now the users name
- Fix compare view not changing code view rendering style
- Fix compare view not changing code view rendering style
- Emoji can be awarded on Snippets !4456
- Exclude email check from the standard health check
- Exclude email check from the standard health check
- Updated layout for Projects, Groups, Users on Admin area. !4424
- Updated layout for Projects, Groups, Users on Admin area. !4424
- Fix changing issue state columns in milestone view
- Fix changing issue state columns in milestone view
...
...
lib/api/award_emoji.rb
View file @
7475f9d1
...
@@ -87,9 +87,7 @@ module API
...
@@ -87,9 +87,7 @@ module API
helpers
do
helpers
do
def
can_read_awardable?
def
can_read_awardable?
ability
=
"read_
#{
awardable
.
class
.
to_s
.
underscore
}
"
.
to_sym
can?
(
current_user
,
ability_name
(
awardable
),
awardable
)
can?
(
current_user
,
ability
,
awardable
)
end
end
def
can_award_awardable?
def
can_award_awardable?
...
@@ -100,18 +98,30 @@ module API
...
@@ -100,18 +98,30 @@ module API
@awardable
||=
@awardable
||=
begin
begin
if
params
.
include?
(
:note_id
)
if
params
.
include?
(
:note_id
)
noteable
.
notes
.
find
(
params
[
:note_id
])
note_id
=
params
[
:note_id
]
params
.
delete
(
:note_id
)
awardable
.
notes
.
find
(
note_id
)
elsif
params
.
include?
(
:issue_id
)
user_project
.
issues
.
find
(
params
[
:issue_id
])
elsif
params
.
include?
(
:merge_request_id
)
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
else
else
noteable
user_project
.
snippets
.
find
(
params
[
:snippet_id
])
end
end
end
end
end
end
def
noteable
def
ability_name
(
awardable
)
if
params
.
include?
(
:issue_id
)
case
awardable
user_project
.
issues
.
find
(
params
[
:issue_id
])
when
Note
else
ability_name
(
awardable
.
noteable
)
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
when
Snippet
:read_project_snippet
when
MergeRequest
:read_merge_request
when
Issue
:read_issue
end
end
end
end
end
end
...
...
spec/requests/api/award_emoji_spec.rb
View file @
7475f9d1
...
@@ -4,7 +4,7 @@ describe API::API, api: true do
...
@@ -4,7 +4,7 @@ describe API::API, api: true do
include
ApiHelpers
include
ApiHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
user
)
}
let!
(
:award_emoji
)
{
create
(
:award_emoji
,
awardable:
issue
,
user:
user
)
}
let!
(
:award_emoji
)
{
create
(
:award_emoji
,
awardable:
issue
,
user:
user
)
}
let!
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let!
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let!
(
:downvote
)
{
create
(
:award_emoji
,
:downvote
,
awardable:
merge_request
,
user:
user
)
}
let!
(
:downvote
)
{
create
(
:award_emoji
,
:downvote
,
awardable:
merge_request
,
user:
user
)
}
...
@@ -14,9 +14,6 @@ describe API::API, api: true do
...
@@ -14,9 +14,6 @@ describe API::API, api: true do
describe
"GET /projects/:id/awardable/:awardable_id/award_emoji"
do
describe
"GET /projects/:id/awardable/:awardable_id/award_emoji"
do
context
'on an issue'
do
context
'on an issue'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
user
)
}
let!
(
:award_emoji
)
{
create
(
:award_emoji
,
awardable:
issue
,
user:
user
)
}
it
"returns an array of award_emoji"
do
it
"returns an array of award_emoji"
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
/award_emoji"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
/award_emoji"
,
user
)
...
@@ -43,7 +40,16 @@ describe API::API, api: true do
...
@@ -43,7 +40,16 @@ describe API::API, api: true do
end
end
context
'on a snippet'
do
context
'on a snippet'
do
it
'returns the awarded '
let
(
:snippet
)
{
create
(
:project_snippet
,
:public
,
project:
project
)
}
let!
(
:award
)
{
create
(
:award_emoji
,
awardable:
snippet
)
}
it
'returns the awarded emoji'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/award_emoji"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
).
to
be_an
Array
expect
(
json_response
.
first
[
'name'
]).
to
eq
(
award
.
name
)
end
end
end
context
'when the user has no access'
do
context
'when the user has no access'
do
...
@@ -98,6 +104,20 @@ describe API::API, api: true do
...
@@ -98,6 +104,20 @@ describe API::API, api: true do
end
end
end
end
context
'on a snippet'
do
let
(
:snippet
)
{
create
(
:project_snippet
,
:public
,
project:
project
)
}
let!
(
:award
)
{
create
(
:award_emoji
,
awardable:
snippet
)
}
it
'returns the awarded emoji'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/award_emoji/
#{
award
.
id
}
"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
[
'name'
]).
to
eq
(
award
.
name
)
expect
(
json_response
[
'awardable_id'
]).
to
eq
(
snippet
.
id
)
expect
(
json_response
[
'awardable_type'
]).
to
eq
(
"Snippet"
)
end
end
context
'when the user has no access'
do
context
'when the user has no access'
do
it
'returns a status code 404'
do
it
'returns a status code 404'
do
user1
=
create
(
:user
)
user1
=
create
(
:user
)
...
@@ -167,6 +187,18 @@ describe API::API, api: true do
...
@@ -167,6 +187,18 @@ describe API::API, api: true do
end
end
end
end
end
end
context
'on a snippet'
do
it
'creates a new award emoji'
do
snippet
=
create
(
:project_snippet
,
:public
,
project:
project
)
post
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/award_emoji"
,
user
),
name:
'blowfish'
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'name'
]).
to
eq
(
'blowfish'
)
expect
(
json_response
[
'user'
][
'username'
]).
to
eq
(
user
.
username
)
end
end
end
end
describe
"POST /projects/:id/awardable/:awardable_id/notes/:note_id/award_emoji"
do
describe
"POST /projects/:id/awardable/:awardable_id/notes/:note_id/award_emoji"
do
...
@@ -236,6 +268,19 @@ describe API::API, api: true do
...
@@ -236,6 +268,19 @@ describe API::API, api: true do
expect
(
response
).
to
have_http_status
(
404
)
expect
(
response
).
to
have_http_status
(
404
)
end
end
end
end
context
'when the awardable is a Snippet'
do
let
(
:snippet
)
{
create
(
:project_snippet
,
:public
,
project:
project
)
}
let!
(
:award
)
{
create
(
:award_emoji
,
awardable:
snippet
,
user:
user
)
}
it
'deletes the award'
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/award_emoji/
#{
award
.
id
}
"
,
user
)
end
.
to
change
{
snippet
.
award_emoji
.
count
}.
from
(
1
).
to
(
0
)
expect
(
response
).
to
have_http_status
(
200
)
end
end
end
end
describe
'DELETE /projects/:id/awardable/:awardable_id/award_emoji/:award_emoji_id'
do
describe
'DELETE /projects/:id/awardable/:awardable_id/award_emoji/:award_emoji_id'
do
...
...
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