Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b7fa7c4d
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,发现更多精彩内容 >>
提交
b7fa7c4d
编写于
4月 01, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extend build status badge, add html/markdown methods
上级
88fc7ccd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
63 addition
and
8 deletion
+63
-8
app/controllers/projects/badges_controller.rb
app/controllers/projects/badges_controller.rb
+2
-0
app/views/projects/badges/index.html.haml
app/views/projects/badges/index.html.haml
+3
-3
lib/gitlab/badge/build.rb
lib/gitlab/badge/build.rb
+26
-4
spec/lib/gitlab/badge/build_spec.rb
spec/lib/gitlab/badge/build_spec.rb
+32
-1
未找到文件。
app/controllers/projects/badges_controller.rb
浏览文件 @
b7fa7c4d
...
...
@@ -2,6 +2,8 @@ class Projects::BadgesController < Projects::ApplicationController
before_action
:no_cache_headers
,
except:
[
:index
]
def
index
@ref
=
params
[
:ref
]
||
'master'
@badge
=
Gitlab
::
Badge
::
Build
.
new
(
@project
,
@ref
)
end
def
build
...
...
app/views/projects/badges/index.html.haml
浏览文件 @
b7fa7c4d
...
...
@@ -4,12 +4,12 @@
.panel.panel-default
.panel-heading
%b
Builds badge
·
=
image_tag
(
build_namespace_project_badges_path
(
@project
.
namespace
,
@project
,
:master
,
format: :svg
),
alt:
'Builds badge'
)
=
@badge
.
to_html
.panel-body
%table
.table
%tr
%td
Markdown
%td
=
markdown
(
"```markdown
\n
[![build status](url)](link)
\n
```"
)
%td
=
markdown
(
"```markdown
\n
#{
@badge
.
to_markdown
}
\n
```"
)
%tr
%td
HTML
%td
=
markdown
(
"```html
\n
<a href='link'><img src='url' /></a>
\n
```"
)
%td
=
markdown
(
"```html
\n
#{
@badge
.
to_html
}
\n
```"
)
lib/gitlab/badge/build.rb
浏览文件 @
b7fa7c4d
...
...
@@ -4,14 +4,15 @@ module Gitlab
# Build badge
#
class
Build
include
Gitlab
::
Application
.
routes
.
url_helpers
include
ActionView
::
Helpers
::
AssetTagHelper
include
ActionView
::
Helpers
::
UrlHelper
def
initialize
(
project
,
ref
)
@project
,
@ref
=
project
,
ref
@image
=
::
Ci
::
ImageForBuildService
.
new
.
execute
(
project
,
ref:
ref
)
end
def
to_s
@image
[
:name
].
sub
(
/\.svg$/
,
''
)
end
def
type
'image/svg+xml'
end
...
...
@@ -19,6 +20,27 @@ module Gitlab
def
data
File
.
read
(
@image
[
:path
])
end
def
to_s
@image
[
:name
].
sub
(
/\.svg$/
,
''
)
end
def
to_html
link_to
(
image_tag
(
image_url
,
alt:
'build status'
),
link_url
)
end
def
to_markdown
"[![build status](
#{
image_url
}
)](
#{
link_url
}
)"
end
def
image_url
build_namespace_project_badges_url
(
@project
.
namespace
,
@project
,
@ref
,
format: :svg
)
end
def
link_url
namespace_project_commits_url
(
@project
.
namespace
,
@project
,
id:
@ref
)
end
end
end
end
spec/lib/gitlab/badge/build_spec.rb
浏览文件 @
b7fa7c4d
...
...
@@ -3,13 +3,44 @@ require 'spec_helper'
describe
Gitlab
::
Badge
::
Build
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:sha
)
{
project
.
commit
.
sha
}
let
(
:badge
)
{
described_class
.
new
(
project
,
'master'
)
}
let
(
:branch
)
{
'master'
}
let
(
:badge
)
{
described_class
.
new
(
project
,
branch
)
}
describe
'#type'
do
subject
{
badge
.
type
}
it
{
is_expected
.
to
eq
'image/svg+xml'
}
end
describe
'#to_html'
do
let
(
:html
)
{
Nokogiri
::
HTML
.
parse
(
badge
.
to_html
)
}
let
(
:a_href
)
{
html
.
at
(
'a'
)
}
it
'points to link'
do
expect
(
a_href
[
:href
]).
to
eq
badge
.
link_url
end
it
'contains clickable image'
do
expect
(
a_href
.
children
.
first
.
name
).
to
eq
'img'
end
end
describe
'#to_markdown'
do
subject
{
badge
.
to_markdown
}
it
{
is_expected
.
to
include
badge
.
image_url
}
it
{
is_expected
.
to
include
badge
.
link_url
}
end
describe
'#image_url'
do
subject
{
badge
.
image_url
}
it
{
is_expected
.
to
include
"badges/
#{
branch
}
/build.svg"
}
end
describe
'#link_url'
do
subject
{
badge
.
link_url
}
it
{
is_expected
.
to
include
"commits/
#{
branch
}
"
}
end
context
'build exists'
do
let
(
:ci_commit
)
{
create
(
:ci_commit
,
project:
project
,
sha:
sha
)
}
let!
(
:build
)
{
create
(
:ci_build
,
commit:
ci_commit
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录