X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FHold.t;h=6c51f54e5e26be3eb03c909f5a5e205378957a8b;hb=d5986c9b972e6634fbc3f52e544316ed607eb502;hp=48f38314a3456896e16f06b357f3b15c281d7e15;hpb=2566dbdc4d7f2fe0e0b164235bac538254df2976;p=srvgit

diff --git a/t/db_dependent/Hold.t b/t/db_dependent/Hold.t
index 48f38314a3..6c51f54e5e 100755
--- a/t/db_dependent/Hold.t
+++ b/t/db_dependent/Hold.t
@@ -17,26 +17,32 @@
 
 use Modern::Perl;
 
+use t::lib::Mocks;
 use C4::Context;
 use C4::Biblio qw( AddBiblio );
 use Koha::Database;
-use Koha::Borrowers;
 use Koha::Libraries;
+use Koha::Patrons;
+use Koha::Holds;
 use Koha::Item;
 use Koha::DateUtils;
+use t::lib::TestBuilder;
 
-use Test::More tests => 31;
+use Test::More tests => 29;
+use Test::Warn;
 
 use_ok('Koha::Hold');
 
 my $schema = Koha::Database->new()->schema();
 $schema->storage->txn_begin();
 
-my $dbh = C4::Context->dbh;
-$dbh->{RaiseError} = 1;
-
-my @branches = Koha::Libraries->search();
-my $borrower = Koha::Borrowers->search()->next();
+# add two branches and a borrower
+my $builder = t::lib::TestBuilder->new;
+my @branches;
+foreach( 1..2 ) {
+    push @branches, $builder->build({ source => 'Branch' });
+}
+my $borrower = $builder->build({ source => 'Borrower' });
 
 my $biblio = MARC::Record->new();
 my $title  = 'Silence in the library';
@@ -50,8 +56,8 @@ my $item = Koha::Item->new(
     {
         biblionumber     => $biblionumber,
         biblioitemnumber => $biblioitemnumber,
-        holdingbranch    => $branches[0]->branchcode(),
-        homebranch       => $branches[0]->branchcode(),
+        holdingbranch    => $branches[0]->{branchcode},
+        homebranch       => $branches[0]->{branchcode},
     }
 );
 $item->store();
@@ -61,8 +67,8 @@ my $hold = Koha::Hold->new(
         biblionumber   => $biblionumber,
         itemnumber     => $item->id(),
         waitingdate    => '2000-01-01',
-        borrowernumber => $borrower->borrowernumber(),
-        branchcode     => $branches[1]->branchcode(),
+        borrowernumber => $borrower->{borrowernumber},
+        branchcode     => $branches[1]->{branchcode},
         suspend        => 0,
     }
 );
@@ -75,44 +81,34 @@ $hold->resume();
 is( $hold->suspend, 0, "Hold is not suspended" );
 my $dt = dt_from_string();
 $hold->suspend_hold( $dt );
+$dt->truncate( to => 'day' );
 is( $hold->suspend, 1, "Hold is suspended" );
-is( $hold->suspend_until, "$dt", "Hold is suspended with a date" );
+is( $hold->suspend_until, "$dt", "Hold is suspended with a date, truncation takes place automatically" );
 $hold->resume();
 is( $hold->suspend, 0, "Hold is not suspended" );
 is( $hold->suspend_until, undef, "Hold no longer has suspend_until date" );
 $hold->found('W');
-$hold->suspend_hold();
+warning_like { $hold->suspend_hold }
+    qr/Unable to suspend waiting hold!/, 'Catch warn about failed suspend';
 is( $hold->suspend, 0, "Waiting hold cannot be suspended" );
 
 $item = $hold->item();
 
 my $hold_borrower = $hold->borrower();
 ok( $hold_borrower, 'Got hold borrower' );
-is( $hold_borrower->borrowernumber(), $borrower->borrowernumber(), 'Hold borrower matches correct borrower' );
-
-C4::Context->set_preference( 'ReservesMaxPickUpDelay', '' );
-$dt = $hold->waiting_expires_on();
-is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if ReservesMaxPickUpDelay is not set" );
+is( $hold_borrower->borrowernumber(), $borrower->{borrowernumber}, 'Hold borrower matches correct borrower' );
 
 is( $hold->is_waiting, 1, 'The hold is waiting' );
 is( $hold->is_found, 1, 'The hold is found');
 ok( !$hold->is_in_transit, 'The hold is not in transit' );
 
-C4::Context->set_preference( 'ReservesMaxPickUpDelay', '5' );
-$dt = $hold->waiting_expires_on();
-is( $dt->ymd, "2000-01-06",
-    "Koha::Hold->waiting_expires_on returns DateTime of waitingdate + ReservesMaxPickUpDelay if set" );
-
+t::lib::Mocks::mock_preference( 'ReservesMaxPickUpDelay', '5' );
 $hold->found('T');
-$dt = $hold->waiting_expires_on();
-is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if found is not 'W' ( Set to 'T' )" );
 isnt( $hold->is_waiting, 1, 'The hold is not waiting (T)' );
 is( $hold->is_found, 1, 'The hold is found');
 is( $hold->is_in_transit, 1, 'The hold is in transit' );
 
 $hold->found(q{});
-$dt = $hold->waiting_expires_on();
-is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if found is not 'W' ( Set to empty string )" );
 isnt( $hold->is_waiting, 1, 'The hold is not waiting (W)' );
 is( $hold->is_found, 0, 'The hold is not found' );
 ok( !$hold->is_in_transit, 'The hold is not in transit' );
@@ -132,9 +128,47 @@ $hold->found('T');
 ok( !$hold->is_at_destination(), "In transit hold cannot be at destination" );
 $hold->found('W');
 ok( !$hold->is_at_destination(), "Waiting hold where hold branchcode is not the same as the item's holdingbranch is not at destination" );
-$item->holdingbranch( $branches[1]->branchcode() );
+$item->holdingbranch( $branches[1]->{branchcode} );
 ok( $hold->is_at_destination(), "Waiting hold where hold branchcode is the same as the item's holdingbranch is at destination" );
 
 $schema->storage->txn_rollback();
 
-1;
+subtest "delete() tests" => sub {
+
+    plan tests => 6;
+
+    $schema->storage->txn_begin();
+
+    # Disable logging
+    t::lib::Mocks::mock_preference( 'HoldsLog', 0 );
+
+    my $hold = $builder->build({ source => 'Reserve' });
+
+    my $hold_object = Koha::Holds->find( $hold->{ reserve_id } );
+    my $deleted = $hold_object->delete;
+    is( $deleted, 1, 'Koha::Hold->delete should return 1 if the hold has been correctly deleted' );
+    is( Koha::Holds->search({ reserve_id => $hold->{ reserve_id } })->count, 0,
+        "Koha::Hold->delete should have deleted the hold" );
+
+    my $number_of_logs = $schema->resultset('ActionLog')->search(
+            { module => 'HOLDS', action => 'DELETE', object => $hold->{ reserve_id } } )->count;
+    is( $number_of_logs, 0, 'With HoldsLogs, Koha::Hold->delete shouldn\'t have been logged' );
+
+    # Enable logging
+    t::lib::Mocks::mock_preference( 'HoldsLog', 1 );
+
+    $hold = $builder->build({ source => 'Reserve' });
+
+    $hold_object = Koha::Holds->find( $hold->{ reserve_id } );
+    $deleted = $hold_object->delete;
+    is( $deleted, 1, 'Koha::Hold->delete should return 1 if the hold has been correctly deleted' );
+    is( Koha::Holds->search({ reserve_id => $hold->{ reserve_id } })->count, 0,
+        "Koha::Hold->delete should have deleted the hold" );
+
+    $number_of_logs = $schema->resultset('ActionLog')->search(
+            { module => 'HOLDS', action => 'DELETE', object => $hold->{ reserve_id } } )->count;
+    is( $number_of_logs, 1, 'With HoldsLogs, Koha::Hold->delete should have been logged' );
+
+    $schema->storage->txn_rollback();
+ };
+