X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FHolds.t;h=93fe7459bad4c6af4c7a59d85010e4b17c0be33a;hb=ef410fd62f279a10687636a4f26babb2c91ecadc;hp=cea420949e6db68df270a498e94037485cdcaa88;hpb=a86d7fd3d097987da8e97054ff37e3061eeb9811;p=koha.git diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index cea420949e..93fe7459ba 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -7,11 +7,10 @@ use t::lib::TestBuilder; use C4::Context; -use Test::More tests => 53; +use Test::More tests => 55; use MARC::Record; use C4::Biblio; use C4::Items; -use C4::Members; use C4::Calendar; use Koha::Database; use Koha::DateUtils qw( dt_from_string output_pref ); @@ -58,12 +57,12 @@ my ($item_bibnum, $item_bibitemnum, $itemnumber) # Create some borrowers my @borrowernumbers; foreach (1..$borrowers_count) { - my $borrowernumber = AddMember( + my $borrowernumber = Koha::Patron->new({ firstname => 'my firstname', surname => 'my surname ' . $_, categorycode => $category->{categorycode}, branchcode => $branch_1, - ); + })->store->borrowernumber; push @borrowernumbers, $borrowernumber; } @@ -121,6 +120,7 @@ ok( $hold_branch == $hold->branch(), "branch method returns stashed branch" ); my $hold_found = $hold->found(); $hold->set({ found => 'W'})->store(); is( Koha::Holds->waiting()->count(), 1, "Koha::Holds->waiting returns waiting holds" ); +is( Koha::Holds->unfilled()->count(), 4, "Koha::Holds->unfilled returns unfilled holds" ); my $patron = Koha::Patrons->find( $borrowernumbers[0] ); $holds = $patron->holds; @@ -146,6 +146,15 @@ ok( $hold->priority eq '4', "Test ModReserve, priority changed correctly" ); ok( $hold->suspend, "Test ModReserve, suspend hold" ); is( $hold->suspend_until, '2013-01-01 00:00:00', "Test ModReserve, suspend until date" ); +ModReserve({ # call without reserve_id + rank => '3', + biblionumber => $item_bibnum, + itemnumber => $itemnumber, + borrowernumber => $borrowernumber, +}); +$hold = Koha::Holds->find( $reserve_id ); +ok( $hold->priority eq '3', "Test ModReserve, priority changed correctly" ); + ToggleSuspend( $reserve_id ); $hold = Koha::Holds->find( $reserve_id ); ok( ! $hold->suspend, "Test ToggleSuspend(), no date" ); @@ -361,18 +370,18 @@ $dbh->do(q{ ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem( { homebranch => $branch_1, holdingbranch => $branch_1, itype => 'CANNOT' } , $bibnum); is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'notReservable', - "CanItemBeReserved should returns 'notReservable'"); + "CanItemBeReserved should return 'notReservable'"); ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem( { homebranch => $branch_2, holdingbranch => $branch_1, itype => 'CAN' } , $bibnum); is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'cannotReserveFromOtherBranches', - "CanItemBeReserved should returns 'cannotReserveFromOtherBranches'"); + "CanItemBeReserved should return 'cannotReserveFromOtherBranches'"); ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem( { homebranch => $branch_1, holdingbranch => $branch_1, itype => 'CAN' } , $bibnum); is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'OK', - "CanItemBeReserved should returns 'OK'"); + "CanItemBeReserved should return 'OK'"); # Bug 12632 t::lib::Mocks::mock_preference( 'item-level_itypes', 1 );