Bug 35468: (follow-up) Fix QA complaints
Tidyness Use dt_from_string, not DateTime->now Add exec flag Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
parent
8ed228ed9e
commit
68ff5edb12
1 changed files with 17 additions and 16 deletions
33
t/db_dependent/api/v1/bookings.t
Normal file → Executable file
33
t/db_dependent/api/v1/bookings.t
Normal file → Executable file
|
@ -27,6 +27,7 @@ use JSON qw(encode_json);
|
|||
|
||||
use Koha::Bookings;
|
||||
use Koha::Database;
|
||||
use Koha::DateUtils qw (dt_from_string);
|
||||
|
||||
my $schema = Koha::Database->new->schema;
|
||||
my $builder = t::lib::TestBuilder->new;
|
||||
|
@ -70,8 +71,8 @@ subtest 'list() tests' => sub {
|
|||
$t->get_ok("//$userid:$password@/api/v1/bookings")->status_is(200)->json_is( [] );
|
||||
|
||||
# One booking
|
||||
my $start_0 = DateTime->now->subtract( days => 2 )->truncate( to => 'day' );
|
||||
my $end_0 = DateTime->now->add( days => 4 )->truncate( to => 'day' );
|
||||
my $start_0 = dt_from_string->subtract( days => 2 )->truncate( to => 'day' );
|
||||
my $end_0 = dt_from_string->add( days => 4 )->truncate( to => 'day' );
|
||||
my $booking_0 = $builder->build_object(
|
||||
{
|
||||
class => 'Koha::Bookings',
|
||||
|
@ -85,8 +86,8 @@ subtest 'list() tests' => sub {
|
|||
$t->get_ok("//$userid:$password@/api/v1/bookings")->status_is(200)->json_is( [ $booking_0->to_api ] );
|
||||
|
||||
# More bookings
|
||||
my $start_1 = DateTime->now->add( days => 1 )->truncate( to => 'day' );
|
||||
my $end_1 = DateTime->now->add( days => 6 )->truncate( to => 'day' );
|
||||
my $start_1 = dt_from_string->add( days => 1 )->truncate( to => 'day' );
|
||||
my $end_1 = dt_from_string->add( days => 6 )->truncate( to => 'day' );
|
||||
my $booking_1 = $builder->build_object(
|
||||
{
|
||||
class => 'Koha::Bookings',
|
||||
|
@ -97,8 +98,8 @@ subtest 'list() tests' => sub {
|
|||
}
|
||||
);
|
||||
|
||||
my $start_2 = DateTime->now->add( days => 4 )->truncate( to => 'day' );
|
||||
my $end_2 = DateTime->now->add( days => 8 )->truncate( to => 'day' );
|
||||
my $start_2 = dt_from_string->add( days => 4 )->truncate( to => 'day' );
|
||||
my $end_2 = dt_from_string->add( days => 8 )->truncate( to => 'day' );
|
||||
my $booking_2 = $builder->build_object(
|
||||
{
|
||||
class => 'Koha::Bookings',
|
||||
|
@ -120,7 +121,7 @@ subtest 'list() tests' => sub {
|
|||
);
|
||||
|
||||
# Filtering works, two bookings after today
|
||||
my $api_filter = encode_json( { 'me.start_date' => { '>=' => DateTime->now->rfc3339 } } );
|
||||
my $api_filter = encode_json( { 'me.start_date' => { '>=' => dt_from_string->rfc3339 } } );
|
||||
$t->get_ok("//$userid:$password@/api/v1/bookings?q=$api_filter")->status_is(200)->json_is(
|
||||
'' => [
|
||||
$booking_1->to_api,
|
||||
|
@ -129,7 +130,7 @@ subtest 'list() tests' => sub {
|
|||
'filtered returns two future bookings'
|
||||
);
|
||||
|
||||
$api_filter = encode_json( { 'me.start_date' => { '<=' => DateTime->now->rfc3339 } } );
|
||||
$api_filter = encode_json( { 'me.start_date' => { '<=' => dt_from_string->rfc3339 } } );
|
||||
$t->get_ok("//$userid:$password@/api/v1/bookings?q=$api_filter")->status_is(200)
|
||||
->json_is( '' => [ $booking_0->to_api ], 'filtering to before today also works' );
|
||||
|
||||
|
@ -216,8 +217,8 @@ subtest 'add() tests' => sub {
|
|||
biblio_id => $biblio->id,
|
||||
item_id => undef,
|
||||
patron_id => $patron->id,
|
||||
start_date => DateTime->now->add( days => 2 )->rfc3339,
|
||||
end_date => DateTime->now->add( days => 6 )->rfc3339,
|
||||
start_date => dt_from_string->add( days => 2 )->rfc3339,
|
||||
end_date => dt_from_string->add( days => 6 )->rfc3339,
|
||||
};
|
||||
|
||||
# Unauthorized attempt to write
|
||||
|
@ -303,8 +304,8 @@ subtest 'update() tests' => sub {
|
|||
my $booking_with_missing_field = {
|
||||
item_id => undef,
|
||||
patron_id => $patron->id,
|
||||
start_date => DateTime->now->add( days => 2 )->rfc3339,
|
||||
end_date => DateTime->now->add( days => 6 )->rfc3339,
|
||||
start_date => dt_from_string->add( days => 2 )->rfc3339,
|
||||
end_date => dt_from_string->add( days => 6 )->rfc3339,
|
||||
};
|
||||
|
||||
$t->put_ok( "//$userid:$password@/api/v1/bookings/$booking_id" => json => $booking_with_missing_field )
|
||||
|
@ -315,8 +316,8 @@ subtest 'update() tests' => sub {
|
|||
biblio_id => $biblio->id,
|
||||
item_id => undef,
|
||||
patron_id => $patron->id,
|
||||
start_date => DateTime->now->add( days => 2 )->rfc3339,
|
||||
end_date => DateTime->now->add( days => 6 )->rfc3339,
|
||||
start_date => dt_from_string->add( days => 2 )->rfc3339,
|
||||
end_date => dt_from_string->add( days => 6 )->rfc3339,
|
||||
};
|
||||
|
||||
$t->put_ok( "//$userid:$password@/api/v1/bookings/$booking_id" => json => $booking_with_updated_field )
|
||||
|
@ -328,8 +329,8 @@ subtest 'update() tests' => sub {
|
|||
biblio_id => $biblio->id,
|
||||
item_id => undef,
|
||||
patron_id => $patron->id,
|
||||
start_date => DateTime->now->add( days => 2 )->rfc3339,
|
||||
end_date => DateTime->now->add( days => 6 )->rfc3339,
|
||||
start_date => dt_from_string->add( days => 2 )->rfc3339,
|
||||
end_date => dt_from_string->add( days => 6 )->rfc3339,
|
||||
};
|
||||
|
||||
$t->put_ok( "//$userid:$password@/api/v1/bookings/$booking_id" => json => $booking_with_invalid_field )
|
||||
|
|
Loading…
Reference in a new issue