Merge branch 'improve_sorting_list' into 'master'

Improve list of sorting options

Closes #36929

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

2 files changed, 8 insertions, 8 deletions

diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index facb67ae787..8759950e013 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -90,17 +90,17 @@ feature 'Dashboard Issues filtering', :js do
 
   context 'sorting' do
     it 'shows sorted issues' do
-      sorting_by('Oldest updated')
+      sorting_by('Created date')
       visit_issues
 
-      expect(find('.issues-filters')).to have_content('Oldest updated')
+      expect(find('.issues-filters')).to have_content('Created date')
     end
 
     it 'keeps sorting issues after visiting Projects Issues page' do
-      sorting_by('Oldest updated')
+      sorting_by('Created date')
       visit project_issues_path(project)
 
-      expect(find('.issues-filters')).to have_content('Oldest updated')
+      expect(find('.issues-filters')).to have_content('Created date')
     end
   end
 
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index b4992dd54a1..8204828b5b9 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -112,19 +112,19 @@ feature 'Dashboard Merge Requests' do
     end
 
     it 'shows sorted merge requests' do
-      sorting_by('Oldest updated')
+      sorting_by('Created date')
 
       visit merge_requests_dashboard_path(assignee_id: current_user.id)
 
-      expect(find('.issues-filters')).to have_content('Oldest updated')
+      expect(find('.issues-filters')).to have_content('Created date')
     end
 
     it 'keeps sorting merge requests after visiting Projects MR page' do
-      sorting_by('Oldest updated')
+      sorting_by('Created date')
 
       visit project_merge_requests_path(project)
 
-      expect(find('.issues-filters')).to have_content('Oldest updated')
+      expect(find('.issues-filters')).to have_content('Created date')
     end
   end
 end