1 files changed, 32 insertions, 8 deletions
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index c8c6b9f41bf..d862e1447e3 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -18,19 +18,19 @@ describe Dashboard::TodosController do
 
         get :index, project_id: unauthorized_project.id
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'renders 404 when given project does not exists' do
         get :index, project_id: 999
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
 
       it 'renders 200 when filtering for "any project" todos' do
         get :index, project_id: ''
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'renders 200 when user has access on given project' do
@@ -38,7 +38,7 @@ describe Dashboard::TodosController do
 
         get :index, project_id: authorized_project.id
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
 
@@ -57,11 +57,11 @@ describe Dashboard::TodosController do
         expect(response).to redirect_to(dashboard_todos_path(page: last_page))
       end
 
-      it 'redirects to correspondent page' do
+      it 'goes to the correct page' do
         get :index, page: last_page
 
         expect(assigns(:todos).current_page).to eq(last_page)
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
       end
 
       it 'does not redirect to external sites when provided a host field' do
@@ -70,6 +70,30 @@ describe Dashboard::TodosController do
 
         expect(response).to redirect_to(dashboard_todos_path(page: last_page))
       end
+
+      context 'when providing no filters' do
+        it 'does not perform a query to get the page count, but gets that from the user' do
+          allow(controller).to receive(:current_user).and_return(user)
+
+          expect(user).to receive(:todos_pending_count).and_call_original
+
+          get :index, page: (last_page + 1).to_param, sort: :created_asc
+
+          expect(response).to redirect_to(dashboard_todos_path(page: last_page, sort: :created_asc))
+        end
+      end
+
+      context 'when providing filters' do
+        it 'performs a query to get the correct page count' do
+          allow(controller).to receive(:current_user).and_return(user)
+
+          expect(user).not_to receive(:todos_pending_count)
+
+          get :index, page: (last_page + 1).to_param, project_id: project.id
+
+          expect(response).to redirect_to(dashboard_todos_path(page: last_page, project_id: project.id))
+        end
+      end
     end
   end
 
@@ -80,7 +104,7 @@ describe Dashboard::TodosController do
       patch :restore, id: todo.id
 
       expect(todo.reload).to be_pending
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ "count" => "1", "done_count" => "0" })
     end
   end
@@ -94,7 +118,7 @@ describe Dashboard::TodosController do
       todos.each do |todo|
         expect(todo.reload).to be_pending
       end
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'count' => '2', 'done_count' => '0' })
     end
   end