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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9784244b
Commit
9784244b
authored
Oct 02, 2020
by
Andy Soiron
Committed by
charlie ablett
Oct 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add spec for API::Github::Entities::User
Add missing spec for the GitHub API user entity.
parent
84bd4dff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
1 deletion
+39
-1
changelogs/unreleased/233016_fix_jira_dvcs_user_avatars.yml
changelogs/unreleased/233016_fix_jira_dvcs_user_avatars.yml
+5
-0
lib/api/github/entities.rb
lib/api/github/entities.rb
+3
-1
spec/lib/api/github/entities_spec.rb
spec/lib/api/github/entities_spec.rb
+31
-0
No files found.
changelogs/unreleased/233016_fix_jira_dvcs_user_avatars.yml
0 → 100644
View file @
9784244b
---
title
:
Fix broken user avatars in Jira Development Panel
merge_request
:
43563
author
:
type
:
fixed
lib/api/github/entities.rb
View file @
9784244b
...
...
@@ -119,7 +119,9 @@ module API
expose
:username
,
as: :login
expose
:user_url
,
as: :url
expose
:user_url
,
as: :html_url
expose
:avatar_url
expose
:avatar_url
do
|
user
|
user
.
avatar_url
(
only_path:
false
)
end
private
...
...
spec/lib/api/github/entities_spec.rb
0 → 100644
View file @
9784244b
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
API
::
Github
::
Entities
do
describe
API
::
Github
::
Entities
::
User
do
let
(
:user
)
{
create
(
:user
,
username:
username
)
}
let
(
:username
)
{
'name_of_user'
}
let
(
:gitlab_protocol_and_host
)
{
"
#{
Gitlab
.
config
.
gitlab
.
protocol
}
://
#{
Gitlab
.
config
.
gitlab
.
host
}
"
}
let
(
:expected_user_url
)
{
"
#{
gitlab_protocol_and_host
}
/
#{
username
}
"
}
let
(
:entity
)
{
described_class
.
new
(
user
)
}
subject
{
entity
.
as_json
}
specify
:aggregate_failure
do
expect
(
subject
[
:id
]).
to
eq
user
.
id
expect
(
subject
[
:login
]).
to
eq
'name_of_user'
expect
(
subject
[
:url
]).
to
eq
expected_user_url
expect
(
subject
[
:html_url
]).
to
eq
expected_user_url
expect
(
subject
[
:avatar_url
]).
to
include
(
'https://www.gravatar.com/avatar'
)
end
context
'with avatar'
do
let
(
:user
)
{
create
(
:user
,
:with_avatar
,
username:
username
)
}
specify
do
expect
(
subject
[
:avatar_url
]).
to
include
(
"
#{
gitlab_protocol_and_host
}
/uploads/-/system/user/avatar/"
)
end
end
end
end
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