@@ -, +, @@ $ kshell k$ prove t/Koha/REST/Plugin/Pagination.t \ t/db_dependent/Koha/REST/Plugin/Objects.t --- t/Koha/REST/Plugin/Pagination.t | 52 ++++++++++++++++++++++- t/db_dependent/Koha/REST/Plugin/Objects.t | 14 +++++- 2 files changed, 64 insertions(+), 2 deletions(-) --- a/t/Koha/REST/Plugin/Pagination.t +++ a/t/Koha/REST/Plugin/Pagination.t @@ -70,6 +70,28 @@ get '/pagination_headers_without_page' => sub { $c->render( json => { ok => 1 }, status => 200 ); }; +get '/pagination_headers_with_minus_one' => sub { + my $c = shift; + $c->add_pagination_headers( + { + total => 10, + params => { _per_page => -1, firstname => 'Jonathan' } + } + ); + $c->render( json => { ok => 1 }, status => 200 ); +}; + +get '/pagination_headers_with_minus_one_and_invalid_page' => sub { + my $c = shift; + $c->add_pagination_headers( + { + total => 10, + params => { page => 100, _per_page => -1, firstname => 'Jonathan' } + } + ); + $c->render( json => { ok => 1 }, status => 200 ); +}; + # The tests use Test::More tests => 2; @@ -79,7 +101,7 @@ use t::lib::Mocks; subtest 'add_pagination_headers() tests' => sub { - plan tests => 75; + plan tests => 101; my $t = Test::Mojo->new; @@ -164,6 +186,34 @@ subtest 'add_pagination_headers() tests' => sub { ->header_like( 'Link' => qr/; rel="last"/ ) ->header_like( 'Link' => qr/; rel="last"/ ) ->header_like( 'Link' => qr/; rel="last"/ ); + + $t->get_ok('/pagination_headers_with_minus_one') + ->status_is( 200 ) + ->header_is( 'X-Total-Count' => 10, 'X-Total-Count header present, with per_page=-1' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="next",/, 'No next page, all resources are fetched' ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="last"/ ) + ->header_like( 'Link' => qr/; rel="last"/ ) + ->header_like( 'Link' => qr/; rel="last"/ ); + + $t->get_ok('/pagination_headers_with_minus_one_and_invalid_page') + ->status_is( 200 ) + ->header_is( 'X-Total-Count' => 10, 'X-Total-Count header present, with per_page=-1' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="prev",/, 'First page, no previous' ) + ->header_unlike( 'Link' => qr/; rel="next",/, 'No next page, all resources are fetched' ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="first",/ ) + ->header_like( 'Link' => qr/; rel="last"/ ) + ->header_like( 'Link' => qr/; rel="last"/ ) + ->header_like( 'Link' => qr/; rel="last"/ ); }; subtest 'dbic_merge_pagination() tests' => sub { --- a/t/db_dependent/Koha/REST/Plugin/Objects.t +++ a/t/db_dependent/Koha/REST/Plugin/Objects.t @@ -91,7 +91,7 @@ my $builder = t::lib::TestBuilder->new; subtest 'objects.search helper' => sub { - plan tests => 44; + plan tests => 50; $schema->storage->txn_begin; @@ -192,6 +192,18 @@ subtest 'objects.search helper' => sub { $response_count = scalar @{ $t->tx->res->json }; is( $response_count, 5, 'RESTdefaultPageSize is honoured by default (5)' ); + $t->get_ok('/cities?_page=1&_per_page=-1') + ->status_is(200); + + $response_count = scalar @{ $t->tx->res->json }; + is( $response_count, 24, '_per_page=-1 means all resources' ); + + $t->get_ok('/cities?_page=100&_per_page=-1') + ->status_is(200); + + $response_count = scalar @{ $t->tx->res->json }; + is( $response_count, 24, 'When _per_page=-1 the page param is not considered' ); + $schema->storage->txn_rollback; }; --