Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b888ed59
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,发现更多精彩内容 >>
未验证
提交
b888ed59
编写于
5月 31, 2017
作者:
L
Luke "Jared" Bennett
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed issuables_helper_spec and added a test for issuable_app_data
上级
632d0c0a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
23 deletion
+49
-23
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+23
-23
spec/helpers/issuables_helper_spec.rb
spec/helpers/issuables_helper_spec.rb
+26
-0
未找到文件。
app/helpers/issuables_helper.rb
浏览文件 @
b888ed59
...
...
@@ -199,6 +199,29 @@ module IssuablesHelper
issuable_filter_params
.
any?
{
|
k
|
params
.
key?
(
k
)
}
end
def
issuable_app_data
(
project
,
issue
)
data
=
{
endpoint:
realtime_changes_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
),
'can-update'
=>
can?
(
current_user
,
:update_issue
,
issue
).
to_s
,
'issuable-ref'
=>
issue
.
to_reference
||
''
}
updated_at_by
=
updated_at_by
(
issue
)
data
.
merge
(
updated_at_by
)
end
def
updated_at_by
(
issuable
)
return
{}
unless
issuable
.
is_edited?
{
updated_at:
issuable
.
updated_at
.
to_time
.
iso8601
,
updated_by:
{
name:
issuable
.
last_edited_by
.
name
,
path:
user_path
(
issuable
.
last_edited_by
)
}
}
end
private
def
sidebar_gutter_collapsed?
...
...
@@ -273,27 +296,4 @@ module IssuablesHelper
container:
(
is_collapsed
?
'body'
:
nil
)
}
end
def
issuable_app_data
(
project
,
issue
)
data
=
{
endpoint:
realtime_changes_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
),
'can-update'
=>
can?
(
current_user
,
:update_issue
,
issue
).
to_s
,
'issuable-ref'
=>
issue
.
to_reference
||
''
}
updated_at_by
=
updated_at_by
(
issue
)
data
.
merge
(
updated_at_by
)
end
def
updated_at_by
(
issuable
)
return
{}
unless
issuable
.
is_edited?
{
updated_at:
issuable
.
updated_at
.
to_time
.
iso8601
,
updated_by:
{
name:
issuable
.
last_edited_by
.
name
,
path:
user_path
(
issuable
.
last_edited_by
)
}
}
end
end
spec/helpers/issuables_helper_spec.rb
浏览文件 @
b888ed59
...
...
@@ -193,6 +193,32 @@ describe IssuablesHelper do
end
end
describe
'#issuable_app_data'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
last_edited_by:
user
,
created_at:
3
.
days
.
ago
,
updated_at:
2
.
days
.
ago
,
last_edited_at:
2
.
days
.
ago
)
}
let
(
:issue_app_data
)
do
{
endpoint:
realtime_changes_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
),
'can-update'
=>
"true"
,
'issuable-ref'
=>
issue
.
to_reference
||
''
,
updated_at:
issue
.
updated_at
.
to_time
.
iso8601
,
updated_by:
{
name:
user
.
name
,
path:
user_path
(
user
)
}
}
end
before
do
allow
(
helper
).
to
receive
(
:current_user
).
and_return
(
nil
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
nil
,
:update_issue
,
issue
).
and_return
(
true
)
end
it
{
expect
(
helper
.
issuable_app_data
(
issue
.
project
,
issue
)).
to
eq
(
issue_app_data
)
}
end
describe
'#updated_at_by'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:unedited_issuable
)
{
create
(
:issue
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录