Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
548da42b
Commit
548da42b
authored
Aug 16, 2016
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement TodoService#mark_todos_as_done_by_id
Follow-up on 52b0c26
parent
30654fc9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
14 deletions
+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
No files found.
app/controllers/dashboard/todos_controller.rb
View file @
548da42b
...
@@ -6,9 +6,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
...
@@ -6,9 +6,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
end
def
destroy
def
destroy
todo
=
Todo
.
new
(
id:
params
[
:id
])
TodoService
.
new
.
mark_todos_as_done_by_id
([
params
[
:id
]],
current_user
)
TodoService
.
new
.
mark_todos_as_done
([
todo
],
current_user
)
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
dashboard_todos_path
,
notice:
'Todo was successfully marked as done.'
}
format
.
html
{
redirect_to
dashboard_todos_path
,
notice:
'Todo was successfully marked as done.'
}
...
...
app/services/todo_service.rb
View file @
548da42b
...
@@ -142,7 +142,11 @@ class TodoService
...
@@ -142,7 +142,11 @@ class TodoService
# When user marks some todos as done
# When user marks some todos as done
def
mark_todos_as_done
(
todos
,
current_user
)
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
)
marked_todos
=
todos
.
update_all
(
state: :done
)
current_user
.
update_todos_count_cache
current_user
.
update_todos_count_cache
...
...
spec/services/todo_service_spec.rb
View file @
548da42b
...
@@ -194,12 +194,12 @@ describe TodoService, services: true do
...
@@ -194,12 +194,12 @@ describe TodoService, services: true do
end
end
end
end
describe
'#mark_todos_as_done'
do
shared_examples
'marking todos as done'
do
|
meth
|
it
'marks related todos for the user as done'
do
let!
(
:first_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
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
)
}
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
(
first_todo
.
reload
).
to
be_done
expect
(
second_todo
.
reload
).
to
be_done
expect
(
second_todo
.
reload
).
to
be_done
...
@@ -207,20 +207,30 @@ describe TodoService, services: true do
...
@@ -207,20 +207,30 @@ describe TodoService, services: true do
describe
'cached counts'
do
describe
'cached counts'
do
it
'updates when todos change'
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_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
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
)
expect
(
john_doe
.
todos_pending_count
).
to
eq
(
0
)
end
end
end
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
describe
'#new_note'
do
let!
(
:first_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
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
)
}
let!
(
:second_todo
)
{
create
(
:todo
,
:assigned
,
user:
john_doe
,
project:
project
,
target:
issue
,
author:
author
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment