diff options
Diffstat (limited to 'spec/features/dashboard/todos')
| -rw-r--r-- | spec/features/dashboard/todos/todos_sorting_spec.rb | 22 | ||||
| -rw-r--r-- | spec/features/dashboard/todos/todos_spec.rb | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/spec/features/dashboard/todos/todos_sorting_spec.rb b/spec/features/dashboard/todos/todos_sorting_spec.rb index d0f9a2b35f3..d593031590e 100644 --- a/spec/features/dashboard/todos/todos_sorting_spec.rb +++ b/spec/features/dashboard/todos/todos_sorting_spec.rb @@ -23,11 +23,12 @@ RSpec.describe 'Dashboard > User sorts todos' do let!(:merge_request_1) { create(:merge_request, source_project: project, title: 'merge_request_1') } before do - create(:todo, user: user, project: project, target: issue_4, created_at: 5.hours.ago) - create(:todo, user: user, project: project, target: issue_2, created_at: 4.hours.ago) - create(:todo, user: user, project: project, target: issue_3, created_at: 3.hours.ago) - create(:todo, user: user, project: project, target: issue_1, created_at: 2.hours.ago) - create(:todo, user: user, project: project, target: merge_request_1, created_at: 1.hour.ago) + create(:todo, user: user, project: project, target: issue_4, created_at: 5.hours.ago, updated_at: 5.hours.ago) + create(:todo, user: user, project: project, target: issue_2, created_at: 4.hours.ago, updated_at: 4.hours.ago) + create(:todo, user: user, project: project, target: issue_3, created_at: 3.hours.ago, updated_at: 2.minutes.ago) + create(:todo, user: user, project: project, target: issue_1, created_at: 2.hours.ago, updated_at: 2.hours.ago) + create(:todo, user: user, project: project, target: merge_request_1, created_at: 1.hour.ago, + updated_at: 1.hour.ago) merge_request_1.labels << label_1 issue_3.labels << label_1 @@ -70,6 +71,17 @@ RSpec.describe 'Dashboard > User sorts todos' do 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 by newest updated todos first' do + click_link 'Updated date' + + results_list = page.find('.todos-list') + 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 context 'issues and merge requests' do diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb index 68d979bb1cf..04e78b59ab4 100644 --- a/spec/features/dashboard/todos/todos_spec.rb +++ b/spec/features/dashboard/todos/todos_spec.rb @@ -211,9 +211,9 @@ RSpec.describe 'Dashboard Todos' do visit dashboard_todos_path end - it 'shows you directly addressed yourself message' do + it 'shows you directly addressed yourself message being displayed as mentioned yourself' do page.within('.js-todos-all') do - 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).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 |