Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fa0cbb13
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,发现更多精彩内容 >>
提交
fa0cbb13
编写于
1月 30, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix specs and add a new one
上级
677b4db9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
28 deletion
+37
-28
spec/helpers/diff_helper_spec.rb
spec/helpers/diff_helper_spec.rb
+13
-4
spec/lib/gitlab/diff/highlight_spec.rb
spec/lib/gitlab/diff/highlight_spec.rb
+24
-24
未找到文件。
spec/helpers/diff_helper_spec.rb
浏览文件 @
fa0cbb13
...
...
@@ -104,8 +104,7 @@ describe DiffHelper do
end
end
describe
'diff_line_content'
do
describe
'#diff_line_content'
do
it
'should return non breaking space when line is empty'
do
expect
(
diff_line_content
(
nil
)).
to
eq
(
' '
)
end
...
...
@@ -116,9 +115,19 @@ describe DiffHelper do
expect
(
diff_line_content
(
diff_file
.
diff_lines
.
first
.
type
)).
to
eq
(
'match'
)
expect
(
diff_file
.
diff_lines
.
first
.
new_pos
).
to
eq
(
6
)
end
end
describe
"#mark_inline_diffs"
do
let
(
:old_line
)
{
%{abc 'def'}
}
let
(
:new_line
)
{
%{abc "def"}
}
it
"returns strings with marked inline diffs"
do
marked_old_line
,
marked_new_line
=
mark_inline_diffs
(
old_line
,
new_line
)
it
'should return safe HTML'
do
expect
(
diff_line_content
(
diff_file
.
diff_lines
.
first
.
text
)).
to
be_html_safe
expect
(
marked_old_line
).
to
eq
(
"abc <span class='idiff left right'>'def'</span>"
)
expect
(
marked_old_line
).
to
be_html_safe
expect
(
marked_new_line
).
to
eq
(
"abc <span class='idiff left right'>"def"</span>"
)
expect
(
marked_new_line
).
to
be_html_safe
end
end
end
spec/lib/gitlab/diff/highlight_spec.rb
浏览文件 @
fa0cbb13
...
...
@@ -40,38 +40,38 @@ describe Gitlab::Diff::Highlight, lib: true do
end
end
context
"with diff lines"
do
let
(
:subject
)
{
Gitlab
::
Diff
::
Highlight
.
new
(
diff_file
.
diff_lines
).
highlight
}
context
"with diff lines"
do
let
(
:subject
)
{
Gitlab
::
Diff
::
Highlight
.
new
(
diff_file
.
diff_lines
).
highlight
}
it
'should return Gitlab::Diff::Line elements'
do
expect
(
subject
.
first
).
to
be_an_instance_of
(
Gitlab
::
Diff
::
Line
)
end
it
'should return Gitlab::Diff::Line elements'
do
expect
(
subject
.
first
).
to
be_an_instance_of
(
Gitlab
::
Diff
::
Line
)
end
it
'should not modify "match" lines'
do
expect
(
subject
[
0
].
text
).
to
eq
(
'@@ -6,12 +6,18 @@ module Popen'
)
expect
(
subject
[
22
].
text
).
to
eq
(
'@@ -19,6 +25,7 @@ module Popen'
)
end
it
'should not modify "match" lines'
do
expect
(
subject
[
0
].
text
).
to
eq
(
'@@ -6,12 +6,18 @@ module Popen'
)
expect
(
subject
[
22
].
text
).
to
eq
(
'@@ -19,6 +25,7 @@ module Popen'
)
end
it
'marks unchanged lines'
do
code
=
%Q{ def popen(cmd, path=nil)}
it
'marks unchanged lines'
do
code
=
%Q{ def popen(cmd, path=nil)}
expect
(
subject
[
2
].
text
).
to
eq
(
code
)
expect
(
subject
[
2
].
text
).
not_to
be_html_safe
end
expect
(
subject
[
2
].
text
).
to
eq
(
code
)
expect
(
subject
[
2
].
text
).
not_to
be_html_safe
end
it
'marks removed lines'
do
code
=
%Q{- raise "System commands must be given as an array of strings"}
it
'marks removed lines'
do
code
=
%Q{- raise "System commands must be given as an array of strings"}
expect
(
subject
[
4
].
text
).
to
eq
(
code
)
expect
(
subject
[
4
].
text
).
not_to
be_html_safe
end
expect
(
subject
[
4
].
text
).
to
eq
(
code
)
expect
(
subject
[
4
].
text
).
not_to
be_html_safe
end
it
'marks added lines'
do
code
=
%Q{+ raise <span class='idiff left right'>RuntimeError, </span>"System commands must be given as an array of strings"}
it
'marks added lines'
do
code
=
%Q{+ raise <span class='idiff left right'>RuntimeError, </span>"System commands must be given as an array of strings"}
expect
(
subject
[
5
].
text
).
to
eq
(
code
)
expect
(
subject
[
5
].
text
).
to
be_html_safe
end
expect
(
subject
[
5
].
text
).
to
eq
(
code
)
expect
(
subject
[
5
].
text
).
to
be_html_safe
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录