Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
548da42b
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 搜索 >>
提交
548da42b
编写于
8月 16, 2016
作者:
A
Ahmad Sherif
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement TodoService#mark_todos_as_done_by_id
Follow-up on 52b0c26
上级
30654fc9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
14 deletion
+26
-14
app/controllers/dashboard/todos_controller.rb
app/controllers/dashboard/todos_controller.rb
+1
-3
app/services/todo_service.rb
app/services/todo_service.rb
+5
-1
spec/services/todo_service_spec.rb
spec/services/todo_service_spec.rb
+20
-10
未找到文件。
app/controllers/dashboard/todos_controller.rb
浏览文件 @
548da42b
...
...
@@ -6,9 +6,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def
destroy
todo
=
Todo
.
new
(
id:
params
[
:id
])
TodoService
.
new
.
mark_todos_as_done
([
todo
],
current_user
)
TodoService
.
new
.
mark_todos_as_done_by_id
([
params
[
:id
]],
current_user
)
respond_to
do
|
format
|
format
.
html
{
redirect_to
dashboard_todos_path
,
notice:
'Todo was successfully marked as done.'
}
...
...
app/services/todo_service.rb
浏览文件 @
548da42b
...
...
@@ -142,7 +142,11 @@ class TodoService
# When user marks some todos as done
def
mark_todos_as_done
(
todos
,
current_user
)
todos
=
current_user
.
todos
.
where
(
id:
todos
.
map
(
&
:id
))
unless
todos
.
respond_to?
(
:update_all
)
mark_todos_as_done_by_id
(
todos
.
select
(
&
:id
),
current_user
)
end
def
mark_todos_as_done_by_id
(
ids
,
current_user
)
todos
=
current_user
.
todos
.
where
(
id:
ids
)
marked_todos
=
todos
.
update_all
(
state: :done
)
current_user
.
update_todos_count_cache
...
...
spec/services/todo_service_spec.rb
浏览文件 @
548da42b
...
...
@@ -194,12 +194,12 @@ describe TodoService, services: true do
end
end
describe
'#mark_todos_as_done'
do
it
'marks related todos for the user as done'
do
first_todo
=
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
second_todo
=
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
shared_examples
'marking todos as done'
do
|
meth
|
let!
(
:first_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
let!
(
:second_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
service
.
mark_todos_as_done
([
first_todo
,
second_todo
],
john_doe
)
it
'marks related todos for the user as done'
do
service
.
send
(
meth
,
collection
,
john_doe
)
expect
(
first_todo
.
reload
).
to
be_done
expect
(
second_todo
.
reload
).
to
be_done
...
...
@@ -207,20 +207,30 @@ describe TodoService, services: true do
describe
'cached counts'
do
it
'updates when todos change'
do
todo
=
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
expect
(
john_doe
.
todos_done_count
).
to
eq
(
0
)
expect
(
john_doe
.
todos_pending_count
).
to
eq
(
1
)
expect
(
john_doe
.
todos_pending_count
).
to
eq
(
2
)
expect
(
john_doe
).
to
receive
(
:update_todos_count_cache
).
and_call_original
service
.
mark_todos_as_done
([
todo
]
,
john_doe
)
service
.
send
(
meth
,
collection
,
john_doe
)
expect
(
john_doe
.
todos_done_count
).
to
eq
(
1
)
expect
(
john_doe
.
todos_done_count
).
to
eq
(
2
)
expect
(
john_doe
.
todos_pending_count
).
to
eq
(
0
)
end
end
end
describe
'#mark_todos_as_done'
do
it_behaves_like
'marking todos as done'
,
:mark_todos_as_done
do
let
(
:collection
)
{
[
first_todo
,
second_todo
]
}
end
end
describe
'#mark_todos_as_done_by_id'
do
it_behaves_like
'marking todos as done'
,
:mark_todos_as_done_by_id
do
let
(
:collection
)
{
[
first_todo
,
second_todo
].
map
(
&
:id
)
}
end
end
describe
'#new_note'
do
let!
(
:first_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
let!
(
:second_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录