Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2ea25cbc
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,发现更多精彩内容 >>
提交
2ea25cbc
编写于
4月 10, 2018
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert adding `Empty` extended status to avoid N+1 queries
上级
199e31eb
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
5 addition
and
59 deletion
+5
-59
lib/gitlab/ci/status/build/common.rb
lib/gitlab/ci/status/build/common.rb
+2
-1
lib/gitlab/ci/status/build/empty.rb
lib/gitlab/ci/status/build/empty.rb
+0
-21
lib/gitlab/ci/status/build/factory.rb
lib/gitlab/ci/status/build/factory.rb
+1
-2
spec/lib/gitlab/ci/status/build/empty_spec.rb
spec/lib/gitlab/ci/status/build/empty_spec.rb
+0
-31
spec/lib/gitlab/ci/status/build/factory_spec.rb
spec/lib/gitlab/ci/status/build/factory_spec.rb
+2
-4
未找到文件。
lib/gitlab/ci/status/build/common.rb
浏览文件 @
2ea25cbc
...
...
@@ -6,7 +6,8 @@ module Gitlab
def
illustration
{
image:
'illustrations/skipped-job_empty.svg'
,
size:
'svg-430'
size:
'svg-430'
,
title:
_
(
'This job does not have a trace.'
),
}
end
...
...
lib/gitlab/ci/status/build/empty.rb
已删除
100644 → 0
浏览文件 @
199e31eb
module
Gitlab
module
Ci
module
Status
module
Build
class
Empty
<
Status
::
Extended
def
illustration
{
image:
'illustrations/skipped-job_empty.svg'
,
size:
'svg-430'
,
title:
_
(
'This job does not have a trace.'
)
}
end
def
self
.
matches?
(
build
,
user
)
!
build
.
has_trace?
end
end
end
end
end
end
lib/gitlab/ci/status/build/factory.rb
浏览文件 @
2ea25cbc
...
...
@@ -9,8 +9,7 @@ module Gitlab
Status
::
Build
::
Canceled
,
Status
::
Build
::
Created
,
Status
::
Build
::
Pending
,
Status
::
Build
::
Skipped
,
Status
::
Build
::
Empty
],
Status
::
Build
::
Skipped
],
[
Status
::
Build
::
Cancelable
,
Status
::
Build
::
Retryable
],
[
Status
::
Build
::
Failed
],
...
...
spec/lib/gitlab/ci/status/build/empty_spec.rb
已删除
100644 → 0
浏览文件 @
199e31eb
require
'spec_helper'
describe
Gitlab
::
Ci
::
Status
::
Build
::
Empty
do
let
(
:build
)
{
create
(
:ci_build
,
:running
)
}
let
(
:status
)
{
double
(
'core status'
)
}
let
(
:user
)
{
double
(
'user'
)
}
subject
{
described_class
.
new
(
status
)
}
describe
'#illustration'
do
it
'provides an empty state illustration'
do
expect
(
subject
.
illustration
).
not_to
be_empty
end
end
describe
'.matches?'
do
subject
{
described_class
.
matches?
(
build
,
user
)
}
context
'when a build has trace'
do
let
(
:build
)
{
create
(
:ci_build
,
:trace_artifact
)
}
it
{
is_expected
.
to
be_falsy
}
end
context
'with a build that has not been retried'
do
let
(
:build
)
{
create
(
:ci_build
,
:running
)
}
it
{
is_expected
.
to
be_truthy
}
end
end
end
spec/lib/gitlab/ci/status/build/factory_spec.rb
浏览文件 @
2ea25cbc
...
...
@@ -75,8 +75,7 @@ describe Gitlab::Ci::Status::Build::Factory do
it
'matches correct extended statuses'
do
expect
(
factory
.
extended_statuses
)
.
to
eq
[
Gitlab
::
Ci
::
Status
::
Build
::
Empty
,
Gitlab
::
Ci
::
Status
::
Build
::
Retryable
,
.
to
eq
[
Gitlab
::
Ci
::
Status
::
Build
::
Retryable
,
Gitlab
::
Ci
::
Status
::
Build
::
Failed
]
end
...
...
@@ -162,8 +161,7 @@ describe Gitlab::Ci::Status::Build::Factory do
it
'matches correct extended statuses'
do
expect
(
factory
.
extended_statuses
)
.
to
eq
[
Gitlab
::
Ci
::
Status
::
Build
::
Empty
,
Gitlab
::
Ci
::
Status
::
Build
::
Cancelable
]
.
to
eq
[
Gitlab
::
Ci
::
Status
::
Build
::
Cancelable
]
end
it
'fabricates a canceable build status'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录