Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
293999ca
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 搜索 >>
提交
293999ca
编写于
2月 05, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix name of build erasable, remove superfluous method from it
上级
ec5c3c02
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
28 addition
and
43 deletion
+28
-43
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
app/models/ci/build/erasable.rb
app/models/ci/build/erasable.rb
+3
-9
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+9
-8
db/migrate/20160202091601_add_erasable_to_ci_build.rb
db/migrate/20160202091601_add_erasable_to_ci_build.rb
+1
-1
lib/api/builds.rb
lib/api/builds.rb
+1
-1
spec/models/ci/build/erasable_spec.rb
spec/models/ci/build/erasable_spec.rb
+11
-21
spec/requests/api/builds_spec.rb
spec/requests/api/builds_spec.rb
+2
-2
未找到文件。
app/models/ci/build.rb
浏览文件 @
293999ca
...
...
@@ -38,7 +38,7 @@
module
Ci
class
Build
<
CommitStatus
include
Gitlab
::
Application
.
routes
.
url_helpers
include
Build
::
Eras
e
able
include
Build
::
Erasable
LAZY_ATTRIBUTES
=
[
'trace'
]
...
...
app/models/ci/build/eras
e
able.rb
→
app/models/ci/build/erasable.rb
浏览文件 @
293999ca
module
Ci
class
Build
module
Eras
e
able
module
Erasable
extend
ActiveSupport
::
Concern
included
do
...
...
@@ -8,7 +8,7 @@ module Ci
end
def
erase!
(
opts
=
{})
raise
StandardError
,
'Build not eras
eable!'
unless
erase
able?
raise
StandardError
,
'Build not eras
able!'
unless
eras
able?
remove_artifacts_file!
remove_artifacts_metadata!
...
...
@@ -16,16 +16,10 @@ module Ci
update_erased!
(
opts
[
:erased_by
])
end
def
eras
e
able?
def
erasable?
complete?
&&
(
artifacts?
||
has_trace?
)
end
def
erase_url
if
eraseable?
erase_namespace_project_build_path
(
project
.
namespace
,
project
,
self
)
end
end
def
erased?
!
self
.
erased_at
.
nil?
end
...
...
app/views/projects/builds/show.html.haml
浏览文件 @
293999ca
...
...
@@ -76,15 +76,15 @@
=
link_to
'#down-build-trace'
,
class:
'btn'
do
%i
.fa.fa-angle-down
-
unless
@build
.
erased?
-
if
@build
.
erased?
.erased.alert.alert-warning
-
erased_by
=
"by
#{
@build
.
erased_by
.
username
}
"
if
@build
.
erased_by
Build has been erased
#{
erased_by
}
#{
time_ago_with_tooltip
(
@build
.
erased_at
)
}
-
else
%pre
.trace
#build-trace
%code
.bash
=
preserve
do
=
raw
@build
.
trace_html
-
else
.erased.alert.alert-warning
-
erased_by
=
"by
#{
@build
.
erased_by
.
username
}
"
if
@build
.
erased_by
Build has been erased
#{
erased_by
}
#{
time_ago_with_tooltip
(
@build
.
erased_at
)
}
%div
#down-build-trace
...
...
@@ -119,9 +119,10 @@
-
elsif
@build
.
retry_url
=
link_to
"Retry"
,
@build
.
retry_url
,
class:
'btn btn-sm btn-primary'
,
method: :post
-
if
@build
.
eraseable?
=
link_to
@build
.
erase_url
,
class:
'btn btn-sm btn-warning'
,
method: :delete
,
data:
{
confirm:
'Are you sure you want to erase this build?'
}
do
-
if
@build
.
erasable?
=
link_to
erase_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn btn-sm btn-warning'
,
method: :delete
,
data:
{
confirm:
'Are you sure you want to erase this build?'
}
do
=
icon
(
'eraser'
)
Erase
...
...
db/migrate/20160202091601_add_eras
e
able_to_ci_build.rb
→
db/migrate/20160202091601_add_erasable_to_ci_build.rb
浏览文件 @
293999ca
class
AddEras
e
ableToCiBuild
<
ActiveRecord
::
Migration
class
AddErasableToCiBuild
<
ActiveRecord
::
Migration
def
change
add_reference
:ci_builds
,
:erased_by
,
references: :users
,
index:
true
add_column
:ci_builds
,
:erased_at
,
:datetime
...
...
lib/api/builds.rb
浏览文件 @
293999ca
...
...
@@ -136,7 +136,7 @@ module API
build
=
get_build
(
params
[
:build_id
])
return
not_found!
(
build
)
unless
build
return
forbidden!
(
'Build is not eras
eable!'
)
unless
build
.
erase
able?
return
forbidden!
(
'Build is not eras
able!'
)
unless
build
.
eras
able?
build
.
erase!
present
build
,
with:
Entities
::
Build
,
...
...
spec/models/ci/build/eras
e
able_spec.rb
→
spec/models/ci/build/erasable_spec.rb
浏览文件 @
293999ca
require
'spec_helper'
describe
Ci
::
Build
::
Eras
e
able
,
models:
true
do
shared_examples
'eras
e
able'
do
describe
Ci
::
Build
::
Erasable
,
models:
true
do
shared_examples
'erasable'
do
it
'should remove artifact file'
do
expect
(
build
.
artifacts_file
.
exists?
).
to
be_falsy
end
...
...
@@ -23,25 +23,20 @@ describe Ci::Build::Eraseable, models: true do
end
end
context
'build is not eras
e
able'
do
context
'build is not erasable'
do
let!
(
:build
)
{
create
(
:ci_build
)
}
describe
'#erase!'
do
it
{
expect
{
build
.
erase!
}.
to
raise_error
(
StandardError
,
/Build not eras
e
able!/
)}
it
{
expect
{
build
.
erase!
}.
to
raise_error
(
StandardError
,
/Build not erasable!/
)}
end
describe
'#eras
e
able?'
do
subject
{
build
.
eras
e
able?
}
describe
'#erasable?'
do
subject
{
build
.
erasable?
}
it
{
is_expected
.
to
eq
false
}
end
describe
'#erase_url'
do
subject
{
build
.
erase_url
}
it
{
is_expected
.
to
be_falsy
}
end
end
context
'build is eras
e
able'
do
context
'build is erasable'
do
let!
(
:build
)
{
create
(
:ci_build_with_trace
,
:success
,
:artifacts
)
}
describe
'#erase!'
do
...
...
@@ -50,7 +45,7 @@ describe Ci::Build::Eraseable, models: true do
context
'erased by user'
do
let!
(
:user
)
{
create
(
:user
,
username:
'eraser'
)
}
include_examples
'eras
e
able'
include_examples
'erasable'
it
'should record user who erased a build'
do
expect
(
build
.
erased_by
).
to
eq
user
...
...
@@ -60,7 +55,7 @@ describe Ci::Build::Eraseable, models: true do
context
'erased by system'
do
let
(
:user
)
{
nil
}
include_examples
'eras
e
able'
include_examples
'erasable'
it
'should not set user who erased a build'
do
expect
(
build
.
erased_by
).
to
be_nil
...
...
@@ -68,16 +63,11 @@ describe Ci::Build::Eraseable, models: true do
end
end
describe
'#eras
e
able?'
do
subject
{
build
.
eras
e
able?
}
describe
'#erasable?'
do
subject
{
build
.
erasable?
}
it
{
is_expected
.
to
eq
true
}
end
describe
'#erase_url'
do
subject
{
build
.
erase_url
}
it
{
is_expected
.
to
be_truthy
}
end
describe
'#erased?'
do
let!
(
:build
)
{
create
(
:ci_build_with_trace
,
:success
,
:artifacts
)
}
subject
{
build
.
erased?
}
...
...
spec/requests/api/builds_spec.rb
浏览文件 @
293999ca
...
...
@@ -175,7 +175,7 @@ describe API::API, api: true do
delete
api
(
"/projects/
#{
project
.
id
}
/builds/
#{
build
.
id
}
/content"
,
user
)
end
context
'build is eras
e
able'
do
context
'build is erasable'
do
let
(
:build
)
{
create
(
:ci_build_with_trace
,
:artifacts
,
:success
,
project:
project
,
commit:
commit
)
}
it
'should erase build content'
do
...
...
@@ -186,7 +186,7 @@ describe API::API, api: true do
end
end
context
'build is not eras
e
able'
do
context
'build is not erasable'
do
let
(
:build
)
{
create
(
:ci_build_with_trace
,
project:
project
,
commit:
commit
)
}
it
'should respond with forbidden'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录