Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
03d199fb
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
03d199fb
编写于
8月 01, 2017
作者:
M
Mehdi Lahmam
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it
上级
56046ca8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
2 deletion
+15
-2
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+6
-2
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+9
-0
未找到文件。
app/models/project_services/jira_service.rb
浏览文件 @
03d199fb
...
...
@@ -104,7 +104,7 @@ class JiraService < IssueTrackerService
def
close_issue
(
entity
,
external_issue
)
issue
=
jira_request
{
client
.
Issue
.
find
(
external_issue
.
iid
)
}
return
if
issue
.
nil?
||
issue
.
resolution
.
present?
||
!
jira_issue_transition_id
.
present?
return
if
issue
.
nil?
||
has_resolution?
(
issue
)
||
!
jira_issue_transition_id
.
present?
commit_id
=
if
entity
.
is_a?
(
Commit
)
entity
.
id
...
...
@@ -118,7 +118,7 @@ class JiraService < IssueTrackerService
# may or may not be allowed. Refresh the issue after transition and check
# if it is closed, so we don't have one comment for every commit.
issue
=
jira_request
{
client
.
Issue
.
find
(
issue
.
key
)
}
if
transition_issue
(
issue
)
add_issue_solved_comment
(
issue
,
commit_id
,
commit_url
)
if
issue
.
resolution
add_issue_solved_comment
(
issue
,
commit_id
,
commit_url
)
if
has_resolution?
(
issue
)
end
def
create_cross_reference_note
(
mentioned
,
noteable
,
author
)
...
...
@@ -216,6 +216,10 @@ class JiraService < IssueTrackerService
end
end
def
has_resolution?
(
issue
)
issue
.
respond_to?
(
:resolution
)
&&
issue
.
resolution
.
present?
end
def
comment_exists?
(
issue
,
message
)
comments
=
jira_request
{
issue
.
comments
}
...
...
spec/models/project_services/jira_service_spec.rb
浏览文件 @
03d199fb
...
...
@@ -153,6 +153,15 @@ describe JiraService do
expect
(
WebMock
).
not_to
have_requested
(
:post
,
@remote_link_url
)
end
it
"does not send comment or remote links to issues with unknown resolution"
do
allow_any_instance_of
(
JIRA
::
Resource
::
Issue
).
to
receive
(
:respond_to?
).
with
(
:resolution
).
and_return
(
false
)
@jira_service
.
close_issue
(
merge_request
,
ExternalIssue
.
new
(
"JIRA-123"
,
project
))
expect
(
WebMock
).
not_to
have_requested
(
:post
,
@comment_url
)
expect
(
WebMock
).
not_to
have_requested
(
:post
,
@remote_link_url
)
end
it
"references the GitLab commit/merge request"
do
stub_config_setting
(
base_url:
custom_base_url
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录