Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
de518e12
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,体验更适合开发者的 AI 搜索 >>
提交
de518e12
编写于
3月 20, 2017
作者:
G
George Andrinopoulos
提交者:
Rémy Coutable
3月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow dot in branch name in trigger/builds endpoint in API
上级
9bfff603
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
49 addition
and
17 deletion
+49
-17
changelogs/unreleased/29438-fix-trigger-webhook-for-ref-with-dot.yml
...unreleased/29438-fix-trigger-webhook-for-ref-with-dot.yml
+4
-0
lib/api/triggers.rb
lib/api/triggers.rb
+1
-1
lib/api/v3/triggers.rb
lib/api/v3/triggers.rb
+1
-1
spec/requests/api/triggers_spec.rb
spec/requests/api/triggers_spec.rb
+22
-8
spec/requests/api/v3/triggers_spec.rb
spec/requests/api/v3/triggers_spec.rb
+21
-7
未找到文件。
changelogs/unreleased/29438-fix-trigger-webhook-for-ref-with-dot.yml
0 → 100644
浏览文件 @
de518e12
---
title
:
Fix trigger webhook for ref with a dot
merge_request
:
10001
author
:
George Andrinopoulos
lib/api/triggers.rb
浏览文件 @
de518e12
...
...
@@ -14,7 +14,7 @@ module API
requires
:token
,
type:
String
,
desc:
'The unique token of trigger'
optional
:variables
,
type:
Hash
,
desc:
'The list of variables to be injected into build'
end
post
":id/(ref/:ref/)trigger/pipeline"
do
post
":id/(ref/:ref/)trigger/pipeline"
,
requirements:
{
ref:
/.+/
}
do
project
=
find_project
(
params
[
:id
])
trigger
=
Ci
::
Trigger
.
find_by_token
(
params
[
:token
].
to_s
)
not_found!
unless
project
&&
trigger
...
...
lib/api/v3/triggers.rb
浏览文件 @
de518e12
...
...
@@ -15,7 +15,7 @@ module API
requires
:token
,
type:
String
,
desc:
'The unique token of trigger'
optional
:variables
,
type:
Hash
,
desc:
'The list of variables to be injected into build'
end
post
":id/(ref/:ref/)trigger/builds"
do
post
":id/(ref/:ref/)trigger/builds"
,
requirements:
{
ref:
/.+/
}
do
project
=
find_project
(
params
[
:id
])
trigger
=
Ci
::
Trigger
.
find_by_token
(
params
[
:token
].
to_s
)
not_found!
unless
project
&&
trigger
...
...
spec/requests/api/triggers_spec.rb
浏览文件 @
de518e12
...
...
@@ -59,14 +59,6 @@ describe API::Triggers do
expect
(
pipeline
.
builds
.
size
).
to
eq
(
5
)
end
it
'creates builds on webhook from other gitlab repository and branch'
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/ref/master/trigger/pipeline?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
5
)
expect
(
response
).
to
have_http_status
(
201
)
end
it
'returns bad request with no pipeline created if there\'s no commit for that ref'
do
post
api
(
"/projects/
#{
project
.
id
}
/trigger/pipeline"
),
options
.
merge
(
ref:
'other-branch'
)
...
...
@@ -101,6 +93,28 @@ describe API::Triggers do
end
end
end
context
'when triggering a pipeline from a trigger token'
do
it
'creates builds from the ref given in the URL, not in the body'
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/ref/master/trigger/pipeline?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
5
)
expect
(
response
).
to
have_http_status
(
201
)
end
context
'when ref contains a dot'
do
it
'creates builds from the ref given in the URL, not in the body'
do
project
.
repository
.
create_file
(
user
,
'.gitlab/gitlabhq/new_feature.md'
,
'something valid'
,
message:
'new_feature'
,
branch_name:
'v.1-branch'
)
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/ref/v.1-branch/trigger/pipeline?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
4
)
expect
(
response
).
to
have_http_status
(
201
)
end
end
end
end
describe
'GET /projects/:id/triggers'
do
...
...
spec/requests/api/v3/triggers_spec.rb
浏览文件 @
de518e12
...
...
@@ -51,13 +51,6 @@ describe API::V3::Triggers do
expect
(
pipeline
.
builds
.
size
).
to
eq
(
5
)
end
it
'creates builds on webhook from other gitlab repository and branch'
do
expect
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/ref/master/trigger/builds?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
5
)
expect
(
response
).
to
have_http_status
(
201
)
end
it
'returns bad request with no builds created if there\'s no commit for that ref'
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/trigger/builds"
),
options
.
merge
(
ref:
'other-branch'
)
expect
(
response
).
to
have_http_status
(
400
)
...
...
@@ -89,6 +82,27 @@ describe API::V3::Triggers do
end
end
end
context
'when triggering a pipeline from a trigger token'
do
it
'creates builds from the ref given in the URL, not in the body'
do
expect
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/ref/master/trigger/builds?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
5
)
expect
(
response
).
to
have_http_status
(
201
)
end
context
'when ref contains a dot'
do
it
'creates builds from the ref given in the URL, not in the body'
do
project
.
repository
.
create_file
(
user
,
'.gitlab/gitlabhq/new_feature.md'
,
'something valid'
,
message:
'new_feature'
,
branch_name:
'v.1-branch'
)
expect
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/ref/v.1-branch/trigger/builds?token=
#{
trigger_token
}
"
),
{
ref:
'refs/heads/other-branch'
}
end
.
to
change
(
project
.
builds
,
:count
).
by
(
4
)
expect
(
response
).
to
have_http_status
(
201
)
end
end
end
end
describe
'GET /projects/:id/triggers'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录