diff options
| author | Francisco Lopez <fjlopez@gitlab.com> | 2017-12-01 15:44:23 +0100 |
|---|---|---|
| committer | Francisco Lopez <fjlopez@gitlab.com> | 2017-12-01 18:32:40 +0100 |
| commit | 82470a1e97f934911c64392deb107a19e85886be (patch) | |
| tree | ec96fe73b0e1f5d02b51a709dbc257f688e5a613 | |
| parent | 11160a60df05bf9cb857e5076d243ec09dd53620 (diff) | |
| download | gitlab-ce-fj-40407-missing-order-paginate.tar.gz | |
Replacing default order(id: :desc) for order(:id)fj-40407-missing-order-paginate
| -rw-r--r-- | lib/api/helpers/pagination.rb | 2 | ||||
| -rw-r--r-- | spec/lib/api/helpers/pagination_spec.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb index c046c857559..bb70370ba77 100644 --- a/lib/api/helpers/pagination.rb +++ b/lib/api/helpers/pagination.rb @@ -50,7 +50,7 @@ module API def add_default_order(relation) if relation.is_a?(ActiveRecord::Relation) && relation.order_values.empty? - relation = relation.order(id: :desc) + relation = relation.order(:id) end relation diff --git a/spec/lib/api/helpers/pagination_spec.rb b/spec/lib/api/helpers/pagination_spec.rb index 9c7a45a4324..a547988d631 100644 --- a/spec/lib/api/helpers/pagination_spec.rb +++ b/spec/lib/api/helpers/pagination_spec.rb @@ -94,22 +94,22 @@ describe API::Helpers::Pagination do end context 'if order' do - it 'is not present it adds default order(id: :desc) if no order is present' do + it 'is not present it adds default order(:id) if no order is present' do resource.order_values = [] paginated_relation = subject.paginate(resource) expect(resource.order_values).to be_empty expect(paginated_relation.order_values).to be_present - expect(paginated_relation.order_values.first).to be_descending + expect(paginated_relation.order_values.first).to be_ascending expect(paginated_relation.order_values.first.expr.name).to eq :id end it 'is present it does not add anything' do - paginated_relation = subject.paginate(resource.order(created_at: :asc)) + paginated_relation = subject.paginate(resource.order(created_at: :desc)) expect(paginated_relation.order_values).to be_present - expect(paginated_relation.order_values.first).to be_ascending + expect(paginated_relation.order_values.first).to be_descending expect(paginated_relation.order_values.first.expr.name).to eq :created_at end end |