Merge branch 'todos/include-issue-mr-titles' into 'master'

Add Issue and Merge Request titles to Todo items

Closes #63488

See merge request gitlab-org/gitlab-ce!30435

3 files changed, 33 insertions, 33 deletions

diff --git a/spec/features/dashboard/todos/todos_filtering_spec.rb b/spec/features/dashboard/todos/todos_filtering_spec.rb
index f273e416597..efa163042f9 100644
--- a/spec/features/dashboard/todos/todos_filtering_spec.rb
+++ b/spec/features/dashboard/todos/todos_filtering_spec.rb
@@ -31,9 +31,9 @@ describe 'Dashboard > User filters todos', :js do
   end
 
   it 'displays all todos without a filter' do
-    expect(page).to have_content issue1.to_reference(full: true)
-    expect(page).to have_content merge_request.to_reference(full: true)
-    expect(page).to have_content issue2.to_reference(full: true)
+    expect(page).to have_content issue1.to_reference(full: false)
+    expect(page).to have_content merge_request.to_reference(full: false)
+    expect(page).to have_content issue2.to_reference(full: false)
   end
 
   it 'filters by project' do
@@ -58,9 +58,9 @@ describe 'Dashboard > User filters todos', :js do
 
     wait_for_requests
 
-    expect(page).to     have_content issue1.to_reference(full: true)
-    expect(page).to     have_content merge_request.to_reference(full: true)
-    expect(page).not_to have_content issue2.to_reference(full: true)
+    expect(page).to     have_content "issue #{issue1.to_reference} \"issue\" at #{group1.name} / project_1"
+    expect(page).to     have_content "merge request #{merge_request.to_reference}"
+    expect(page).not_to have_content "issue #{issue2.to_reference} \"issue\" at #{group2.name} / project_3"
   end
 
   context 'Author filter' do
diff --git a/spec/features/dashboard/todos/todos_sorting_spec.rb b/spec/features/dashboard/todos/todos_sorting_spec.rb
index 3870c661784..421a66c6d48 100644
--- a/spec/features/dashboard/todos/todos_sorting_spec.rb
+++ b/spec/features/dashboard/todos/todos_sorting_spec.rb
@@ -42,33 +42,33 @@ describe 'Dashboard > User sorts todos' do
       click_link 'Last created'
 
       results_list = page.find('.todos-list')
-      expect(results_list.all('p')[0]).to have_content('merge_request_1')
-      expect(results_list.all('p')[1]).to have_content('issue_1')
-      expect(results_list.all('p')[2]).to have_content('issue_3')
-      expect(results_list.all('p')[3]).to have_content('issue_2')
-      expect(results_list.all('p')[4]).to have_content('issue_4')
+      expect(results_list.all('.todo-title')[0]).to have_content('merge_request_1')
+      expect(results_list.all('.todo-title')[1]).to have_content('issue_1')
+      expect(results_list.all('.todo-title')[2]).to have_content('issue_3')
+      expect(results_list.all('.todo-title')[3]).to have_content('issue_2')
+      expect(results_list.all('.todo-title')[4]).to have_content('issue_4')
     end
 
     it 'sorts with newest created todos first' do
       click_link 'Oldest created'
 
       results_list = page.find('.todos-list')
-      expect(results_list.all('p')[0]).to have_content('issue_4')
-      expect(results_list.all('p')[1]).to have_content('issue_2')
-      expect(results_list.all('p')[2]).to have_content('issue_3')
-      expect(results_list.all('p')[3]).to have_content('issue_1')
-      expect(results_list.all('p')[4]).to have_content('merge_request_1')
+      expect(results_list.all('.todo-title')[0]).to have_content('issue_4')
+      expect(results_list.all('.todo-title')[1]).to have_content('issue_2')
+      expect(results_list.all('.todo-title')[2]).to have_content('issue_3')
+      expect(results_list.all('.todo-title')[3]).to have_content('issue_1')
+      expect(results_list.all('.todo-title')[4]).to have_content('merge_request_1')
     end
 
     it 'sorts by label priority' do
       click_link 'Label priority'
 
       results_list = page.find('.todos-list')
-      expect(results_list.all('p')[0]).to have_content('issue_3')
-      expect(results_list.all('p')[1]).to have_content('merge_request_1')
-      expect(results_list.all('p')[2]).to have_content('issue_1')
-      expect(results_list.all('p')[3]).to have_content('issue_2')
-      expect(results_list.all('p')[4]).to have_content('issue_4')
+      expect(results_list.all('.todo-title')[0]).to have_content('issue_3')
+      expect(results_list.all('.todo-title')[1]).to have_content('merge_request_1')
+      expect(results_list.all('.todo-title')[2]).to have_content('issue_1')
+      expect(results_list.all('.todo-title')[3]).to have_content('issue_2')
+      expect(results_list.all('.todo-title')[4]).to have_content('issue_4')
     end
   end
 
@@ -93,9 +93,9 @@ describe 'Dashboard > User sorts todos' do
       click_link 'Label priority'
 
       results_list = page.find('.todos-list')
-      expect(results_list.all('p')[0]).to have_content('issue_1')
-      expect(results_list.all('p')[1]).to have_content('issue_2')
-      expect(results_list.all('p')[2]).to have_content('merge_request_1')
+      expect(results_list.all('.todo-title')[0]).to have_content('issue_1')
+      expect(results_list.all('.todo-title')[1]).to have_content('issue_2')
+      expect(results_list.all('.todo-title')[2]).to have_content('merge_request_1')
     end
   end
 end
diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index b98a04b0bda..867281da1e6 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -3,10 +3,10 @@
 require 'spec_helper'
 
 describe 'Dashboard Todos' do
-  let(:user)    { create(:user) }
+  let(:user)    { create(:user, username: 'john') }
   let(:author)  { create(:user) }
   let(:project) { create(:project, :public) }
-  let(:issue)   { create(:issue, due_date: Date.today) }
+  let(:issue)   { create(:issue, due_date: Date.today, title: "Fix bug") }
 
   context 'User does not have todos' do
     before do
@@ -135,7 +135,7 @@ describe 'Dashboard Todos' do
 
       it 'shows issue assigned to yourself message' do
         page.within('.js-todos-all') do
-          expect(page).to have_content("You assigned issue #{issue.to_reference(full: true)} to yourself")
+          expect(page).to have_content("You assigned issue #{issue.to_reference} \"Fix bug\" at #{project.namespace.owner_name} / #{project.name} to yourself")
         end
       end
     end
@@ -148,7 +148,7 @@ describe 'Dashboard Todos' do
 
       it 'shows you added a todo message' do
         page.within('.js-todos-all') do
-          expect(page).to have_content("You added a todo for issue #{issue.to_reference(full: true)}")
+          expect(page).to have_content("You added a todo for issue #{issue.to_reference} \"Fix bug\" at #{project.namespace.owner_name} / #{project.name}")
           expect(page).not_to have_content('to yourself')
         end
       end
@@ -162,7 +162,7 @@ describe 'Dashboard Todos' do
 
       it 'shows you mentioned yourself message' do
         page.within('.js-todos-all') do
-          expect(page).to have_content("You mentioned yourself on issue #{issue.to_reference(full: true)}")
+          expect(page).to have_content("You mentioned yourself on issue #{issue.to_reference} \"Fix bug\" at #{project.namespace.owner_name} / #{project.name}")
           expect(page).not_to have_content('to yourself')
         end
       end
@@ -176,14 +176,14 @@ describe 'Dashboard Todos' do
 
       it 'shows you directly addressed yourself message' do
         page.within('.js-todos-all') do
-          expect(page).to have_content("You directly addressed yourself on issue #{issue.to_reference(full: true)}")
+          expect(page).to have_content("You directly addressed yourself on issue #{issue.to_reference} \"Fix bug\" at #{project.namespace.owner_name} / #{project.name}")
           expect(page).not_to have_content('to yourself')
         end
       end
     end
 
     context 'approval todo' do
-      let(:merge_request) { create(:merge_request) }
+      let(:merge_request) { create(:merge_request, title: "Fixes issue") }
 
       before do
         create(:todo, :approval_required, user: user, project: project, target: merge_request, author: user)
@@ -192,7 +192,7 @@ describe 'Dashboard Todos' do
 
       it 'shows you set yourself as an approver message' do
         page.within('.js-todos-all') do
-          expect(page).to have_content("You set yourself as an approver for merge request #{merge_request.to_reference(full: true)}")
+          expect(page).to have_content("You set yourself as an approver for merge request #{merge_request.to_reference} \"Fixes issue\" at #{project.namespace.owner_name} / #{project.name}")
           expect(page).not_to have_content('to yourself')
         end
       end
@@ -354,7 +354,7 @@ describe 'Dashboard Todos' do
     it 'links to the pipelines for the merge request' do
       href = pipelines_project_merge_request_path(project, todo.target)
 
-      expect(page).to have_link "merge request #{todo.target.to_reference(full: true)}", href: href
+      expect(page).to have_link "merge request #{todo.target.to_reference}", href: href
     end
   end
 end