From a373ecffca1512404cb4f237399e3bf275d87f69 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 9 Jul 2021 12:08:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../merge_requests/user_lists_merge_requests_spec.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'spec/features/merge_requests') diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb index 6b8dcd7dbb6..ab6242784fe 100644 --- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb @@ -23,7 +23,9 @@ RSpec.describe 'Merge requests > User lists merge requests' do milestone: create(:milestone, project: project, due_date: '2013-12-11'), created_at: 1.minute.ago, updated_at: 1.minute.ago) - create(:merge_request, + @fix.metrics.update_column(:merged_at, 10.seconds.ago) + + @markdown = create(:merge_request, title: 'markdown', source_project: project, source_branch: 'markdown', @@ -32,12 +34,15 @@ RSpec.describe 'Merge requests > User lists merge requests' do milestone: create(:milestone, project: project, due_date: '2013-12-12'), created_at: 2.minutes.ago, updated_at: 2.minutes.ago) - create(:merge_request, + @markdown.metrics.update_column(:merged_at, 50.seconds.ago) + + @merge_test = create(:merge_request, title: 'merge-test', source_project: project, source_branch: 'merge-test', created_at: 3.minutes.ago, updated_at: 10.seconds.ago) + @merge_test.metrics.update_column(:merged_at, 10.seconds.ago) end context 'merge request reviewers' do @@ -102,6 +107,13 @@ RSpec.describe 'Merge requests > User lists merge requests' do expect(count_merge_requests).to eq(3) end + it 'sorts by merged at' do + visit_merge_requests(project, sort: sort_value_merged_date) + + expect(first_merge_request).to include('markdown') + expect(count_merge_requests).to eq(3) + end + it 'filters on one label and sorts by due date' do label = create(:label, project: project) create(:label_link, label: label, target: @fix) -- cgit v1.2.3