Commit c3e923c4 authored by DJ Mountney's avatar DJ Mountney

Ensure we don't show TODOS for projects pending delete

By joining the Todos on the project table.
parent ab75b21c
...@@ -23,7 +23,7 @@ class TodosFinder ...@@ -23,7 +23,7 @@ class TodosFinder
end end
def execute def execute
items = current_user.todos items = current_user.todos.joins(:project).where(projects: { pending_delete: false })
items = by_action_id(items) items = by_action_id(items)
items = by_author(items) items = by_author(items)
items = by_project(items) items = by_project(items)
......
...@@ -98,5 +98,18 @@ describe 'Dashboard Todos', feature: true do ...@@ -98,5 +98,18 @@ describe 'Dashboard Todos', feature: true do
end end
end end
end end
context 'User has a Todo in a project pending deletion' do
before do
deleted_project = create(:project, pending_delete: true)
create(:todo, :mentioned, user: user, project: deleted_project, target: issue, author: author)
login_as(user)
visit dashboard_todos_path
end
it 'shows "All done" message' do
expect(page).to have_content "You're all done!"
end
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment