Skip to content

Commit 7130207

Browse files
committed
Merge pull request #615 from coryodaniel/pagination-links-consistency
Make offset and paged paginators links consistent
2 parents 5ba403a + 44f8da8 commit 7130207

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

lib/jsonapi/paginator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def links_page_params(options = {})
5858

5959
previous_offset = 0 if previous_offset < 0
6060

61-
links_page_params['previous'] = {
61+
links_page_params['prev'] = {
6262
'offset' => previous_offset,
6363
'limit' => @limit
6464
}

test/unit/pagination/offset_paginator_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ def test_offset_links_page_params_large_data_set_before_start
161161
assert_equal 5, links_params['first']['limit']
162162
assert_equal 0, links_params['first']['offset']
163163

164-
assert_equal 5, links_params['previous']['limit']
165-
assert_equal 0, links_params['previous']['offset']
164+
assert_equal 5, links_params['prev']['limit']
165+
assert_equal 0, links_params['prev']['offset']
166166

167167
assert_equal 5, links_params['next']['limit']
168168
assert_equal 7, links_params['next']['offset']
@@ -187,8 +187,8 @@ def test_offset_links_page_params_large_data_set_middle
187187
assert_equal 5, links_params['first']['limit']
188188
assert_equal 0, links_params['first']['offset']
189189

190-
assert_equal 5, links_params['previous']['limit']
191-
assert_equal 22, links_params['previous']['offset']
190+
assert_equal 5, links_params['prev']['limit']
191+
assert_equal 22, links_params['prev']['offset']
192192

193193
assert_equal 5, links_params['next']['limit']
194194
assert_equal 32, links_params['next']['offset']
@@ -213,8 +213,8 @@ def test_offset_links_page_params_large_data_set_end
213213
assert_equal 5, links_params['first']['limit']
214214
assert_equal 0, links_params['first']['offset']
215215

216-
assert_equal 5, links_params['previous']['limit']
217-
assert_equal 40, links_params['previous']['offset']
216+
assert_equal 5, links_params['prev']['limit']
217+
assert_equal 40, links_params['prev']['offset']
218218

219219
assert_equal 5, links_params['last']['limit']
220220
assert_equal 45, links_params['last']['offset']
@@ -236,8 +236,8 @@ def test_offset_links_page_params_large_data_set_past_end
236236
assert_equal 5, links_params['first']['limit']
237237
assert_equal 0, links_params['first']['offset']
238238

239-
assert_equal 5, links_params['previous']['limit']
240-
assert_equal 43, links_params['previous']['offset']
239+
assert_equal 5, links_params['prev']['limit']
240+
assert_equal 43, links_params['prev']['offset']
241241

242242
assert_equal 5, links_params['last']['limit']
243243
assert_equal 45, links_params['last']['offset']

0 commit comments

Comments
 (0)