Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
0fe7c694
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0fe7c694
编写于
11月 15, 2015
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1892 from csimons/jenkins-31235
[FIXED JENKINS-31235] fix createItem/copy API args
上级
d6b7c57d
f0a95994
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
98 addition
and
6 deletion
+98
-6
core/src/main/java/hudson/model/ItemGroupMixIn.java
core/src/main/java/hudson/model/ItemGroupMixIn.java
+6
-3
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/View.java
+7
-3
test/src/test/java/hudson/jobs/CreateItemTest.java
test/src/test/java/hudson/jobs/CreateItemTest.java
+85
-0
未找到文件。
core/src/main/java/hudson/model/ItemGroupMixIn.java
浏览文件 @
0fe7c694
...
@@ -146,10 +146,14 @@ public abstract class ItemGroupMixIn {
...
@@ -146,10 +146,14 @@ public abstract class ItemGroupMixIn {
TopLevelItem
result
;
TopLevelItem
result
;
String
requestContentType
=
req
.
getContentType
();
String
requestContentType
=
req
.
getContentType
();
if
(
requestContentType
==
null
)
String
mode
=
req
.
getParameter
(
"mode"
);
if
(
requestContentType
==
null
&&
!(
mode
!=
null
&&
mode
.
equals
(
"copy"
)))
throw
new
Failure
(
"No Content-Type header set"
);
throw
new
Failure
(
"No Content-Type header set"
);
boolean
isXmlSubmission
=
requestContentType
.
startsWith
(
"application/xml"
)
||
requestContentType
.
startsWith
(
"text/xml"
);
boolean
isXmlSubmission
=
requestContentType
!=
null
&&
(
requestContentType
.
startsWith
(
"application/xml"
)
||
requestContentType
.
startsWith
(
"text/xml"
));
String
name
=
req
.
getParameter
(
"name"
);
String
name
=
req
.
getParameter
(
"name"
);
if
(
name
==
null
)
if
(
name
==
null
)
...
@@ -162,7 +166,6 @@ public abstract class ItemGroupMixIn {
...
@@ -162,7 +166,6 @@ public abstract class ItemGroupMixIn {
throw
new
Failure
(
Messages
.
Hudson_JobAlreadyExists
(
name
));
throw
new
Failure
(
Messages
.
Hudson_JobAlreadyExists
(
name
));
}
}
String
mode
=
req
.
getParameter
(
"mode"
);
if
(
mode
!=
null
&&
mode
.
equals
(
"copy"
))
{
if
(
mode
!=
null
&&
mode
.
equals
(
"copy"
))
{
String
from
=
req
.
getParameter
(
"from"
);
String
from
=
req
.
getParameter
(
"from"
);
...
...
core/src/main/java/hudson/model/View.java
浏览文件 @
0fe7c694
...
@@ -1157,18 +1157,22 @@ public abstract class View extends AbstractModelObject implements AccessControll
...
@@ -1157,18 +1157,22 @@ public abstract class View extends AbstractModelObject implements AccessControll
public
static
View
create
(
StaplerRequest
req
,
StaplerResponse
rsp
,
ViewGroup
owner
)
public
static
View
create
(
StaplerRequest
req
,
StaplerResponse
rsp
,
ViewGroup
owner
)
throws
FormException
,
IOException
,
ServletException
{
throws
FormException
,
IOException
,
ServletException
{
String
mode
=
req
.
getParameter
(
"mode"
);
String
requestContentType
=
req
.
getContentType
();
String
requestContentType
=
req
.
getContentType
();
if
(
requestContentType
==
null
)
if
(
requestContentType
==
null
&&
!(
mode
!=
null
&&
mode
.
equals
(
"copy"
)))
throw
new
Failure
(
"No Content-Type header set"
);
throw
new
Failure
(
"No Content-Type header set"
);
boolean
isXmlSubmission
=
requestContentType
.
startsWith
(
"application/xml"
)
||
requestContentType
.
startsWith
(
"text/xml"
);
boolean
isXmlSubmission
=
requestContentType
!=
null
&&
(
requestContentType
.
startsWith
(
"application/xml"
)
||
requestContentType
.
startsWith
(
"text/xml"
));
String
name
=
req
.
getParameter
(
"name"
);
String
name
=
req
.
getParameter
(
"name"
);
checkGoodName
(
name
);
checkGoodName
(
name
);
if
(
owner
.
getView
(
name
)!=
null
)
if
(
owner
.
getView
(
name
)!=
null
)
throw
new
Failure
(
Messages
.
Hudson_ViewAlreadyExists
(
name
));
throw
new
Failure
(
Messages
.
Hudson_ViewAlreadyExists
(
name
));
String
mode
=
req
.
getParameter
(
"mode"
);
if
(
mode
==
null
||
mode
.
length
()==
0
)
{
if
(
mode
==
null
||
mode
.
length
()==
0
)
{
if
(
isXmlSubmission
)
{
if
(
isXmlSubmission
)
{
View
v
=
createViewFromXML
(
name
,
req
.
getInputStream
());
View
v
=
createViewFromXML
(
name
,
req
.
getInputStream
());
...
...
test/src/test/java/hudson/jobs/CreateItemTest.java
0 → 100644
浏览文件 @
0fe7c694
/*
* The MIT License
*
* Copyright 2015 Christopher Simons
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson.jobs
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
java.net.URL
;
import
java.text.MessageFormat
;
import
org.junit.Before
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Issue
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException
;
import
com.gargoylesoftware.htmlunit.HttpMethod
;
import
com.gargoylesoftware.htmlunit.WebRequest
;
/**
* Tests the /createItem REST API.
*
* @author Christopher Simons
*/
public
class
CreateItemTest
{
private
static
final
int
ERROR_PRESET
=
(-
1
);
@Rule
public
JenkinsRule
rule
=
new
JenkinsRule
();
@Before
public
void
setup
()
{
rule
.
jenkins
.
setSecurityRealm
(
rule
.
createDummySecurityRealm
());
}
@Issue
(
"JENKINS-31235"
)
@Test
public
void
testCreateItemFromCopy
()
throws
Exception
{
rule
.
jenkins
.
setCrumbIssuer
(
null
);
String
sourceJobName
=
"sourceJob"
;
rule
.
createFreeStyleProject
(
sourceJobName
);
String
newJobName
=
"newJob"
;
URL
apiURL
=
new
URL
(
MessageFormat
.
format
(
"{0}createItem?mode=copy&from={1}&name={2}"
,
rule
.
getURL
().
toString
(),
sourceJobName
,
newJobName
));
WebRequest
request
=
new
WebRequest
(
apiURL
,
HttpMethod
.
POST
);
deleteContentTypeHeader
(
request
);
int
result
=
ERROR_PRESET
;
try
{
result
=
rule
.
createWebClient
()
.
getPage
(
request
).
getWebResponse
().
getStatusCode
();
}
catch
(
FailingHttpStatusCodeException
e
)
{
result
=
e
.
getResponse
().
getStatusCode
();
}
assertEquals
(
"Creating job from copy should succeed."
,
200
,
result
);
}
private
void
deleteContentTypeHeader
(
WebRequest
request
)
{
request
.
setEncodingType
(
null
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录