Skip to content

Commit 44f8da8

Browse files
committed
Removed tests supporting prev/previous compat
1 parent 1aca7d6 commit 44f8da8

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

lib/jsonapi/paginator.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ def links_page_params(options = {})
6262
'offset' => previous_offset,
6363
'limit' => @limit
6464
}
65-
66-
links_page_params['previous'] = links_page_params['prev']
6765
end
6866

6967
next_offset = @offset + @limit

test/controllers/controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3053,7 +3053,7 @@ def test_books_operation_links
30533053
assert_response :success
30543054
assert_equal 12, json_response['data'].size
30553055
assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
3056-
assert_equal 6, json_response['links'].size
3056+
assert_equal 5, json_response['links'].size
30573057
assert_equal 'https://test_corp.com', json_response['links']['spec']
30583058
ensure
30593059
JSONAPI.configuration = original_config

test/unit/pagination/offset_paginator_test.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ def test_offset_links_page_params_large_data_set_before_start
156156
paginator = OffsetPaginator.new(params)
157157
links_params = paginator.links_page_params(record_count: 50)
158158

159-
assert_equal 5, links_params.size
159+
assert_equal 4, links_params.size
160160

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']
@@ -182,13 +182,13 @@ def test_offset_links_page_params_large_data_set_middle
182182
paginator = OffsetPaginator.new(params)
183183
links_params = paginator.links_page_params(record_count: 50)
184184

185-
assert_equal 5, links_params.size
185+
assert_equal 4, links_params.size
186186

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']
@@ -208,13 +208,13 @@ def test_offset_links_page_params_large_data_set_end
208208
paginator = OffsetPaginator.new(params)
209209
links_params = paginator.links_page_params(record_count: 50)
210210

211-
assert_equal 4, links_params.size
211+
assert_equal 3, links_params.size
212212

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']
@@ -231,13 +231,13 @@ def test_offset_links_page_params_large_data_set_past_end
231231
paginator = OffsetPaginator.new(params)
232232
links_params = paginator.links_page_params(record_count: 50)
233233

234-
assert_equal 4, links_params.size
234+
assert_equal 3, links_params.size
235235

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)