From ba1d94da25de8b50eecb1da2ad2b6b34ec00d54b Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 19 Nov 2019 11:57:52 +0000 Subject: [PATCH] Bug 23964: (follow-up) more test clarification --- .../prog/en/modules/members/tables/guarantor_search.tt | 2 +- t/db_dependent/Reserves.t | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt index a82f0e8dcb..633765ddaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt @@ -18,7 +18,7 @@ "dt_address": "[% INCLUDE escape_address data=data %]", "dt_action": - "Select" + "Select" }[% UNLESS loop.last %],[% END %] [% END %] ] diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t index 92c9068738..84fefb7cbc 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -672,7 +672,7 @@ subtest '_koha_notify_reserve() tests' => sub { }; subtest 'ReservesNeedReturns' => sub { - plan tests => 10; + plan tests => 11; my $library = $builder->build_object( { class => 'Koha::Libraries' } ); my $item_info = { @@ -721,8 +721,10 @@ subtest 'ReservesNeedReturns' => sub { $hold = place_item_hold( $patron, $item, $library, $priority ); is( $hold->priority, 0, 'If ReservesNeedReturns is 0 and damaged holds allowed, priority must have been set to 0' ); is( $hold->found, 'W', 'If ReservesNeedReturns is 0 and damaged holds allowed, found must have been set waiting' ); + $hold->delete; my $hold_1 = place_item_hold( $patron, $item, $library, $priority ); + is( $hold_1->priority, 0, 'First hold on item is set to waiting with ReservesNeedReturns set to 0' ); $hold = place_item_hold( $patron_2, $item, $library, $priority ); is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item already on hold priority must be set to 1' ); $hold->delete; @@ -734,7 +736,7 @@ subtest 'ReservesNeedReturns' => sub { } }); $item->damaged(0)->store; $hold = place_item_hold( $patron, $item, $library, $priority ); - isnt( $hold->priority, 0, 'If ReservesNeedReturns is 0 but item in transit the hold must not be set to waiting' ); + is( $hold->priority, 1, 'If ReservesNeedReturns is 0 but item in transit the hold must not be set to waiting' ); t::lib::Mocks::mock_preference('ReservesNeedReturns', 1); # Don't affect other tests }; -- 2.11.0