Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c86fa0e4
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,发现更多精彩内容 >>
未验证
提交
c86fa0e4
编写于
5月 21, 2019
作者:
M
Matija Čupić
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename with_all_reports to with_reports
上级
9e6f3774
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
10 deletion
+13
-10
app/models/ci/job_artifact.rb
app/models/ci/job_artifact.rb
+9
-4
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+1
-1
app/serializers/job_artifact_report_entity.rb
app/serializers/job_artifact_report_entity.rb
+1
-3
spec/models/ci/job_artifact_spec.rb
spec/models/ci/job_artifact_spec.rb
+2
-2
未找到文件。
app/models/ci/job_artifact.rb
浏览文件 @
c86fa0e4
...
...
@@ -26,10 +26,13 @@ module Ci
metrics:
'metrics.txt'
}.
freeze
TYPE_AND_FORMAT_PAIR
S
=
{
INTERNAL_TYPE
S
=
{
archive: :zip
,
metadata: :gzip
,
trace: :raw
,
trace: :raw
}.
freeze
REPORT_TYPES
=
{
junit: :gzip
,
metrics: :gzip
,
...
...
@@ -45,6 +48,8 @@ module Ci
performance: :raw
}.
freeze
TYPE_AND_FORMAT_PAIRS
=
INTERNAL_TYPES
.
merge
(
REPORT_TYPES
).
freeze
belongs_to
:project
belongs_to
:job
,
class_name:
"Ci::Build"
,
foreign_key: :job_id
...
...
@@ -66,8 +71,8 @@ module Ci
where
(
file_type:
types
)
end
scope
:with_
all_
reports
,
->
do
w
here
(
file_type:
self
.
file_types
.
values
.
drop
(
3
))
scope
:with_reports
,
->
do
w
ith_file_types
(
REPORT_TYPES
.
keys
.
map
(
&
:to_s
))
end
scope
:test_reports
,
->
do
...
...
app/serializers/build_details_entity.rb
浏览文件 @
c86fa0e4
...
...
@@ -43,7 +43,7 @@ class BuildDetailsEntity < JobEntity
end
expose
:reports
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_build
,
build
)
},
using:
JobArtifactReportEntity
do
|
build
|
build
.
job_artifacts
.
merge
(
Ci
::
JobArtifact
.
with_all_reports
)
build
.
job_artifacts
.
with_reports
end
expose
:erased_by
,
if:
->
(
*
)
{
build
.
erased?
},
using:
UserEntity
...
...
app/serializers/job_artifact_report_entity.rb
浏览文件 @
c86fa0e4
...
...
@@ -8,8 +8,6 @@ class JobArtifactReportEntity < Grape::Entity
expose
:size
expose
:download_path
do
|
artifact
|
download_project_job_artifacts_path
(
job
.
project
,
job
,
file_type:
artifact
.
file_format
)
download_project_job_artifacts_path
(
artifact
.
job
.
project
,
artifact
.
job
,
file_type:
artifact
.
file_format
)
end
alias_method
:job
,
:object
end
spec/models/ci/job_artifact_spec.rb
浏览文件 @
c86fa0e4
...
...
@@ -23,10 +23,10 @@ describe Ci::JobArtifact do
it_behaves_like
'having unique enum values'
describe
'.with_
all_
reports'
do
describe
'.with_reports'
do
let!
(
:artifact
)
{
create
(
:ci_job_artifact
,
:archive
)
}
subject
{
described_class
.
with_
all_
reports
}
subject
{
described_class
.
with_reports
}
it
{
is_expected
.
to
be_empty
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录