Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 5c3f7c09e22..5aa74134692 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -84,6 +84,16 @@ describe Issue do
     end
   end
 
+  describe '.simple_sorts' do
+    it 'includes all keys' do
+      expect(described_class.simple_sorts.keys).to include(
+        *%w(created_asc created_at_asc created_date created_desc created_at_desc
+            closest_future_date closest_future_date_asc due_date due_date_asc due_date_desc
+            id_asc id_desc relative_position relative_position_asc
+            updated_desc updated_asc updated_at_asc updated_at_desc))
+    end
+  end
+
   describe '#order_by_position_and_priority' do
     let(:project) { create :project }
     let(:p1) { create(:label, title: 'P1', project: project, priority: 1) }