summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-02-18 09:06:22 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-02-18 09:06:22 +0000
commit6eb45df2fd62c85920c3ef025d7dacadcda05bf4 (patch)
tree0fb4cdc4e765e1ab48ddf17cba4b179b68dcc4a2 /spec/controllers
parent5f3f6ee605f3151214030835d058199fddac46fd (diff)
parent26160459b56019f445a7d29abc0b72f591e1d2a9 (diff)
downloadgitlab-ce-6eb45df2fd62c85920c3ef025d7dacadcda05bf4.tar.gz
Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master'
Todo done clicking is kind of unusable. Closes #25465 See merge request !8691
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/dashboard/todos_controller_spec.rb25
1 files changed, 20 insertions, 5 deletions
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index 79ef3a1adad..0a3ac9f9512 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -1,16 +1,19 @@
require 'spec_helper'
describe Dashboard::TodosController do
+ include ApiHelpers
+
let(:user) { create(:user) }
+ let(:author) { create(:user) }
let(:project) { create(:empty_project) }
let(:todo_service) { TodoService.new }
- describe 'GET #index' do
- before do
- sign_in(user)
- project.team << [user, :developer]
- end
+ before do
+ sign_in(user)
+ project.team << [user, :developer]
+ end
+ describe 'GET #index' do
context 'when using pagination' do
let(:last_page) { user.todos.page.total_pages }
let!(:issues) { create_list(:issue, 2, project: project, assignee: user) }
@@ -34,4 +37,16 @@ describe Dashboard::TodosController do
end
end
end
+
+ describe 'PATCH #restore' do
+ let(:todo) { create(:todo, :done, user: user, project: project, author: author) }
+
+ it 'restores the todo to pending state' do
+ patch :restore, id: todo.id
+
+ expect(todo.reload).to be_pending
+ expect(response).to have_http_status(200)
+ expect(json_response).to eq({ "count" => 1, "done_count" => 0 })
+ end
+ end
end