stklcode/wp-liveticker
1
0
Fork 0
Code Issues Releases 7 Activity

re-enable default pagination in API if "limit" is not specified
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Stefan Kalscheuer 2021-05-22 19:06:24 +02:00
parent 2a228fc39c
commit 2cc277638f
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/class-api.php
View File

@ -64,13 +64,15 @@ class Api {
); );
} }
if ( ! empty( $limit ) && $limit > 0 ) { if ( $limit > 0 ) {
$args['posts_per_page'] = $limit; $args['posts_per_page'] = $limit;
} else { $args['paged'] = 1;
} elseif ( $limit < 0 ) {
$args['nopaging'] = true; $args['nopaging'] = true;
$args['paged'] = 0;
} }
if ( $last_poll > 0 ) { if ( ! empty( $last_poll ) ) {
$last_poll = explode( $last_poll = explode(
',', ',',
gmdate( gmdate(

22
tests/test-api.php
View File

@ -104,7 +104,8 @@ class Test_API extends WP_UnitTestCase {
self::assertEquals( 200, $response->get_status(), 'Unexpected status code' ); self::assertEquals( 200, $response->get_status(), 'Unexpected status code' );
self::assertEquals( 2, count( $response->get_data() ), 'Unexpected number of tickers' ); self::assertEquals( 2, count( $response->get_data() ), 'Unexpected number of tickers' );
// Query all entries. // Query all entries. The "limit" parameter should overrule "per_page".
$request->set_param( 'limit', - 1 );
$response = $wp_rest_server->dispatch( $request ); $response = $wp_rest_server->dispatch( $request );
self::assertEquals( 200, $response->get_status(), 'Unexpected status code' ); self::assertEquals( 200, $response->get_status(), 'Unexpected status code' );
self::assertEquals( 20, count( $response->get_data() ), 'Unexpected number of ticks without filter' ); self::assertEquals( 20, count( $response->get_data() ), 'Unexpected number of ticks without filter' );
@ -115,12 +116,27 @@ class Test_API extends WP_UnitTestCase {
self::assertEquals( 200, $response->get_status(), 'Unexpected status code with limit' ); self::assertEquals( 200, $response->get_status(), 'Unexpected status code with limit' );
self::assertEquals( 12, count( $response->get_data() ), 'Unexpected number of ticks with limit' ); self::assertEquals( 12, count( $response->get_data() ), 'Unexpected number of ticks with limit' );
// Use built-in pagination.
$request->set_param( 'limit', null );
$request->set_param( 'per_page', 13 );
$response = $wp_rest_server->dispatch( $request );
self::assertEquals( 200, $response->get_status(), 'Unexpected status code for first page' );
self::assertEquals( 13, count( $response->get_data() ), 'Unexpected number of ticks for first page' );
self::assertEquals( 20, $response->get_headers()['X-WP-Total'], 'Unexpected total header' );
self::assertEquals( 2, $response->get_headers()['X-WP-TotalPages'], 'Unexpected pages header' );
$request->set_param( 'page', 2 );
$response = $wp_rest_server->dispatch( $request );
self::assertEquals( 200, $response->get_status(), 'Unexpected status code for second page' );
self::assertEquals( 7, count( $response->get_data() ), 'Unexpected number of ticks for second page' );
// Filter by time. // Filter by time.
$request->set_param( 'limit', null ); $request->set_param( 'limit', null );
$request->set_param( 'last', $response->get_data()[5]['date_gmt'] ); $request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$request->set_param( 'last', $dt->sub( new DateInterval( 'PT4M' ) )->format( 'Y-m-d H:i:s' ) );
$response = $wp_rest_server->dispatch( $request ); $response = $wp_rest_server->dispatch( $request );
self::assertEquals( 200, $response->get_status(), 'Unexpected status code with time filter' ); self::assertEquals( 200, $response->get_status(), 'Unexpected status code with time filter' );
self::assertEquals( 5, count( $response->get_data() ), 'Unexpected number of ticks with time filter' ); self::assertEquals( 3, count( $response->get_data() ), 'Unexpected number of ticks with time filter' );
// Filter by ticker. // Filter by ticker.
$request->set_param( 'last', null ); $request->set_param( 'last', null );