From 0d236638b683d368d5384e95dd75772a68c727c2 Mon Sep 17 00:00:00 2001
From: "Vitaliy @blackst0ne Klachkov" <blackst0ne.ru@gmail.com>
Date: Sat, 23 Sep 2017 11:46:53 +1100
Subject: Improve list of sorting options

---
 spec/features/issues_spec.rb | 52 ++++++++++----------------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

(limited to 'spec/features/issues_spec.rb')

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 5c284a1fe5f..fb763c93c66 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -190,19 +190,12 @@ describe 'Issues' do
     let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
 
     it 'sorts by newest' do
-      visit project_issues_path(project, sort: sort_value_recently_created)
+      visit project_issues_path(project, sort: sort_value_created_date)
 
       expect(first_issue).to include('foo')
       expect(last_issue).to include('baz')
     end
 
-    it 'sorts by oldest' do
-      visit project_issues_path(project, sort: sort_value_oldest_created)
-
-      expect(first_issue).to include('baz')
-      expect(last_issue).to include('foo')
-    end
-
     it 'sorts by most recently updated' do
       baz.updated_at = Time.now + 100
       baz.save
@@ -211,36 +204,22 @@ describe 'Issues' do
       expect(first_issue).to include('baz')
     end
 
-    it 'sorts by least recently updated' do
-      baz.updated_at = Time.now - 100
-      baz.save
-      visit project_issues_path(project, sort: sort_value_oldest_updated)
-
-      expect(first_issue).to include('baz')
-    end
-
     describe 'sorting by due date' do
       before do
         foo.update(due_date: 1.day.from_now)
         bar.update(due_date: 6.days.from_now)
       end
 
-      it 'sorts by recently due date' do
-        visit project_issues_path(project, sort: sort_value_due_date_soon)
+      it 'sorts by due date' do
+        visit project_issues_path(project, sort: sort_value_due_date)
 
         expect(first_issue).to include('foo')
       end
 
-      it 'sorts by least recently due date' do
-        visit project_issues_path(project, sort: sort_value_due_date_later)
-
-        expect(first_issue).to include('bar')
-      end
-
-      it 'sorts by least recently due date by excluding nil due dates' do
+      it 'sorts by due date by excluding nil due dates' do
         bar.update(due_date: nil)
 
-        visit project_issues_path(project, sort: sort_value_due_date_later)
+        visit project_issues_path(project, sort: sort_value_due_date)
 
         expect(first_issue).to include('foo')
       end
@@ -339,19 +318,12 @@ describe 'Issues' do
         bar.save
       end
 
-      it 'sorts by recently due milestone' do
-        visit project_issues_path(project, sort: sort_value_milestone_soon)
+      it 'sorts by milestone' do
+        visit project_issues_path(project, sort: sort_value_milestone)
 
         expect(first_issue).to include('foo')
         expect(last_issue).to include('baz')
       end
-
-      it 'sorts by least recently due milestone' do
-        visit project_issues_path(project, sort: sort_value_milestone_later)
-
-        expect(first_issue).to include('bar')
-        expect(last_issue).to include('baz')
-      end
     end
 
     describe 'combine filter and sort' do
@@ -365,13 +337,11 @@ describe 'Issues' do
       end
 
       it 'sorts with a filter applied' do
-        visit project_issues_path(project,
-                                            sort: sort_value_oldest_created,
-                                            assignee_id: user2.id)
+        visit project_issues_path(project, sort: sort_value_created_date, assignee_id: user2.id)
 
-        expect(first_issue).to include('bar')
-        expect(last_issue).to include('foo')
-        expect(page).not_to have_content 'baz'
+        expect(first_issue).to include('foo')
+        expect(last_issue).to include('bar')
+        expect(page).not_to have_content('baz')
       end
     end
   end
-- 
cgit v1.2.3