Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/graphql/resolvers/project_milestones_resolver_spec.rb b/spec/graphql/resolvers/project_milestones_resolver_spec.rb
index b641a54393e..e168291c804 100644
--- a/spec/graphql/resolvers/project_milestones_resolver_spec.rb
+++ b/spec/graphql/resolvers/project_milestones_resolver_spec.rb
@@ -71,6 +71,24 @@ RSpec.describe Resolvers::ProjectMilestonesResolver do
       end
     end
 
+    context 'by sort' do
+      it 'calls MilestonesFinder with correct parameters' do
+        expect(MilestonesFinder).to receive(:new)
+          .with(args(project_ids: project.id, state: 'all', sort: :due_date_desc))
+          .and_call_original
+
+        resolve_project_milestones(sort: :due_date_desc)
+      end
+
+      %i[expired_last_due_date_asc expired_last_due_date_desc].each do |sort_by|
+        it "uses offset-pagination when sorting by #{sort_by}" do
+          resolved = resolve_project_milestones(sort: sort_by)
+
+          expect(resolved).to be_a(::Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection)
+        end
+      end
+    end
+
     context 'by timeframe' do
       context 'when start_date and end_date are present' do
         it 'calls MilestonesFinder with correct parameters' do