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
Jérome Perrin
gitlab-ce
Commits
9c740133
Commit
9c740133
authored
Nov 17, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow JIRA references for project snippets
parent
671c6d7d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
70 additions
and
32 deletions
+70
-32
app/models/concerns/mentionable.rb
app/models/concerns/mentionable.rb
+1
-1
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+16
-14
app/models/snippet.rb
app/models/snippet.rb
+1
-0
changelogs/unreleased/issue_24303.yml
changelogs/unreleased/issue_24303.yml
+4
-0
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+48
-17
No files found.
app/models/concerns/mentionable.rb
View file @
9c740133
# == Mentionable concern
# == Mentionable concern
#
#
# Contains functionality related to objects that can mention Users, Issues, MergeRequests,
or Commi
ts by
# Contains functionality related to objects that can mention Users, Issues, MergeRequests,
Commits or Snippe
ts by
# GFM references.
# GFM references.
#
#
# Used by Issue, Note, MergeRequest, and Commit.
# Used by Issue, Note, MergeRequest, and Commit.
...
...
app/models/project_services/jira_service.rb
View file @
9c740133
...
@@ -128,15 +128,9 @@ class JiraService < IssueTrackerService
...
@@ -128,15 +128,9 @@ class JiraService < IssueTrackerService
return
unless
jira_issue
.
present?
return
unless
jira_issue
.
present?
project
=
self
.
project
noteable_id
=
noteable
.
respond_to?
(
:iid
)
?
noteable
.
iid
:
noteable
.
id
noteable_name
=
noteable
.
model_name
.
singular
noteable_type
=
noteable_name
(
noteable
)
noteable_id
=
if
noteable
.
is_a?
(
Commit
)
entity_url
=
build_entity_url
(
noteable_type
,
noteable_id
)
noteable
.
id
else
noteable
.
iid
end
entity_url
=
build_entity_url
(
noteable_name
.
to_sym
,
noteable_id
)
data
=
{
data
=
{
user:
{
user:
{
...
@@ -144,11 +138,11 @@ class JiraService < IssueTrackerService
...
@@ -144,11 +138,11 @@ class JiraService < IssueTrackerService
url:
resource_url
(
user_path
(
author
)),
url:
resource_url
(
user_path
(
author
)),
},
},
project:
{
project:
{
name:
project
.
path_with_namespace
,
name:
self
.
project
.
path_with_namespace
,
url:
resource_url
(
namespace_project_path
(
project
.
namespace
,
project
))
url:
resource_url
(
namespace_project_path
(
project
.
namespace
,
self
.
project
))
},
},
entity:
{
entity:
{
name:
noteable_
nam
e
.
humanize
.
downcase
,
name:
noteable_
typ
e
.
humanize
.
downcase
,
url:
entity_url
,
url:
entity_url
,
title:
noteable
.
title
title:
noteable
.
title
}
}
...
@@ -285,18 +279,26 @@ class JiraService < IssueTrackerService
...
@@ -285,18 +279,26 @@ class JiraService < IssueTrackerService
"
#{
Settings
.
gitlab
.
base_url
.
chomp
(
"/"
)
}#{
resource
}
"
"
#{
Settings
.
gitlab
.
base_url
.
chomp
(
"/"
)
}#{
resource
}
"
end
end
def
build_entity_url
(
entity_nam
e
,
entity_id
)
def
build_entity_url
(
noteable_typ
e
,
entity_id
)
polymorphic_url
(
polymorphic_url
(
[
[
self
.
project
.
namespace
.
becomes
(
Namespace
),
self
.
project
.
namespace
.
becomes
(
Namespace
),
self
.
project
,
self
.
project
,
entity_name
noteable_type
.
to_sym
],
],
id:
entity_id
,
id:
entity_id
,
host:
Settings
.
gitlab
.
base_url
host:
Settings
.
gitlab
.
base_url
)
)
end
end
def
noteable_name
(
noteable
)
name
=
noteable
.
model_name
.
singular
# ProjectSnippet inherits from Snippet class so it causes
# routing error building the URL.
name
==
"project_snippet"
?
"snippet"
:
name
end
# Handle errors when doing JIRA API calls
# Handle errors when doing JIRA API calls
def
jira_request
def
jira_request
yield
yield
...
...
app/models/snippet.rb
View file @
9c740133
...
@@ -6,6 +6,7 @@ class Snippet < ActiveRecord::Base
...
@@ -6,6 +6,7 @@ class Snippet < ActiveRecord::Base
include
Referable
include
Referable
include
Sortable
include
Sortable
include
Awardable
include
Awardable
include
Mentionable
cache_markdown_field
:title
,
pipeline: :single_line
cache_markdown_field
:title
,
pipeline: :single_line
cache_markdown_field
:content
cache_markdown_field
:content
...
...
changelogs/unreleased/issue_24303.yml
0 → 100644
View file @
9c740133
---
title
:
Fix JIRA references for project snippets
merge_request
:
author
:
spec/services/system_note_service_spec.rb
View file @
9c740133
...
@@ -543,7 +543,10 @@ describe SystemNoteService, services: true do
...
@@ -543,7 +543,10 @@ describe SystemNoteService, services: true do
let
(
:comment_url
)
{
jira_api_comment_url
(
jira_issue
.
id
)
}
let
(
:comment_url
)
{
jira_api_comment_url
(
jira_issue
.
id
)
}
let
(
:success_message
)
{
"JiraService SUCCESS: Successfully posted to http://jira.example.net."
}
let
(
:success_message
)
{
"JiraService SUCCESS: Successfully posted to http://jira.example.net."
}
before
{
stub_jira_urls
(
jira_issue
.
id
)
}
before
do
stub_jira_urls
(
jira_issue
.
id
)
jira_service_settings
end
noteable_types
=
[
"merge_requests"
,
"commit"
]
noteable_types
=
[
"merge_requests"
,
"commit"
]
...
@@ -569,16 +572,16 @@ describe SystemNoteService, services: true do
...
@@ -569,16 +572,16 @@ describe SystemNoteService, services: true do
end
end
end
end
context
'in JIRA issue tracker'
do
before
{
jira_service_settings
}
describe
"new reference"
do
describe
"new reference"
do
subject
{
described_class
.
cross_reference
(
jira_issue
,
commit
,
author
)
}
context
'for commits'
do
it
"creates comment"
do
result
=
described_class
.
cross_reference
(
jira_issue
,
commit
,
author
)
it
{
is_expected
.
to
eq
(
success_message
)
}
expect
(
result
).
to
eq
(
success_message
)
end
it
"creates remote link"
do
it
"creates remote link"
do
subject
described_class
.
cross_reference
(
jira_issue
,
commit
,
author
)
expect
(
WebMock
).
to
have_requested
(
:post
,
jira_api_remote_link_url
(
jira_issue
)).
with
(
expect
(
WebMock
).
to
have_requested
(
:post
,
jira_api_remote_link_url
(
jira_issue
)).
with
(
body:
hash_including
(
body:
hash_including
(
...
@@ -593,18 +596,18 @@ describe SystemNoteService, services: true do
...
@@ -593,18 +596,18 @@ describe SystemNoteService, services: true do
).
once
).
once
end
end
end
end
end
context
'in commit'
do
context
'for issues'
do
context
'in JIRA issue tracker'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
{
jira_service_settings
}
subject
{
described_class
.
cross_reference
(
jira_issue
,
issue
,
author
)
}
it
"creates comment"
do
result
=
described_class
.
cross_reference
(
jira_issue
,
issue
,
author
)
it
{
is_expected
.
to
eq
(
success_message
)
}
expect
(
result
).
to
eq
(
success_message
)
end
it
"creates remote link"
do
it
"creates remote link"
do
subject
described_class
.
cross_reference
(
jira_issue
,
issue
,
author
)
expect
(
WebMock
).
to
have_requested
(
:post
,
jira_api_remote_link_url
(
jira_issue
)).
with
(
expect
(
WebMock
).
to
have_requested
(
:post
,
jira_api_remote_link_url
(
jira_issue
)).
with
(
body:
hash_including
(
body:
hash_including
(
...
@@ -619,6 +622,32 @@ describe SystemNoteService, services: true do
...
@@ -619,6 +622,32 @@ describe SystemNoteService, services: true do
).
once
).
once
end
end
end
end
context
'for snippets'
do
let
(
:snippet
)
{
create
(
:snippet
,
project:
project
)
}
it
"creates comment"
do
result
=
described_class
.
cross_reference
(
jira_issue
,
snippet
,
author
)
expect
(
result
).
to
eq
(
success_message
)
end
it
"creates remote link"
do
described_class
.
cross_reference
(
jira_issue
,
snippet
,
author
)
expect
(
WebMock
).
to
have_requested
(
:post
,
jira_api_remote_link_url
(
jira_issue
)).
with
(
body:
hash_including
(
GlobalID
:
"GitLab"
,
object:
{
url:
namespace_project_snippet_url
(
project
.
namespace
,
project
,
snippet
),
title:
"GitLab: Mentioned on snippet -
#{
snippet
.
title
}
"
,
icon:
{
title:
"GitLab"
,
url16x16:
"https://gitlab.com/favicon.ico"
},
status:
{
resolved:
false
}
}
)
).
once
end
end
end
end
describe
"existing reference"
do
describe
"existing reference"
do
...
@@ -627,9 +656,11 @@ describe SystemNoteService, services: true do
...
@@ -627,9 +656,11 @@ describe SystemNoteService, services: true do
allow_any_instance_of
(
JIRA
::
Resource
::
Issue
).
to
receive
(
:comments
).
and_return
([
OpenStruct
.
new
(
body:
message
)])
allow_any_instance_of
(
JIRA
::
Resource
::
Issue
).
to
receive
(
:comments
).
and_return
([
OpenStruct
.
new
(
body:
message
)])
end
end
subject
{
described_class
.
cross_reference
(
jira_issue
,
commit
,
author
)
}
it
"does not return success message"
do
result
=
described_class
.
cross_reference
(
jira_issue
,
commit
,
author
)
it
{
is_expected
.
not_to
eq
(
success_message
)
}
expect
(
result
).
not_to
eq
(
success_message
)
end
it
'does not try to create comment and remote link'
do
it
'does not try to create comment and remote link'
do
subject
subject
...
...
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