Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #37587 - ensure page and per_page are integers #11124

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fixes #37587 - ensure page and per_page are integers #11124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5cefc8
Fixes #37587 - ensure page and per_page are integers
jeremylenz Aug 30, 2024
5d2577f
Refs #37587 - add test
jeremylenz Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/katello/api/v2/api_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def scoped_search(query, default_sort_by, default_sort_order, options = {})
else
query = query.paginate(paginate_options)
end
page = params[:page] || 1
per_page = params[:per_page] || Setting[:entries_per_page]
page = metadata_page # from Foreman Api::V2::BaseController
per_page = metadata_per_page
query = (total.zero? || subtotal.zero?) ? blank_query : query

if options[:csv]
Expand Down
14 changes: 14 additions & 0 deletions test/controllers/api/v2/api_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ def test_scoped_search_full_results_false
assert_equal(2, response[:results].length)
end

def test_scoped_search_casts_to_integer
params = { full_result: 'false', page: '1', per_page: '2' }
@controller.stubs(:params).returns(params)

response = @controller.scoped_search(@query, @default_sort[0], @default_sort[1], @options)
refute_empty response[:results], "results"
assert_nil response[:error], "error"
assert_equal 1, response[:page], "page"
assert_kind_of(Integer, response[:page])
assert_equal 2, response[:per_page], "per page"
assert_kind_of(Integer, response[:per_page])
assert_equal(2, response[:results].length)
end

def test_scoped_search_no_results
params = { :search => "asdfasdf" }
@controller.stubs(:params).returns(params)
Expand Down
Loading