From 88735eb7c869b23b939de40f1791859670588b8e Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 19 Jun 2013 10:30:58 -0700 Subject: [PATCH] bug 10495: set precondition for HoldsQueue test t/db_dependent/HoldsQueue.t assumed, but did not check, that the AutomaticItemReturns system preference was off at the beginning of the test un. This patch makes sure that that assumption is met. To test: [1] Make sure that at least one item is on loan (this is another assumption that the test case makes, one that should be corrected with the work proposed for bug 10336. [2] Turn the AutomaticItemReturn system preference on. [3] Run the test: prove -v t/db_dependent/HoldsQueue.t [4] Tests 4 and 6 should fail. [5] Apply the patch. [6] Run the test case again; this time, all tests should pass. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- t/db_dependent/HoldsQueue.t | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t index 0e4b981..8de2583 100755 --- a/t/db_dependent/HoldsQueue.t +++ b/t/db_dependent/HoldsQueue.t @@ -110,6 +110,7 @@ my $test_sth = $dbh->prepare("SELECT * FROM hold_fill_targets WHERE borrowernumber = $borrowernumber"); # We have a book available homed in borrower branch, no point fiddling with AutomaticItemReturn +C4::Context->set_preference('AutomaticItemReturn', 0); test_queue ('take from homebranch', 0, $borrower_branchcode, $borrower_branchcode); test_queue ('take from homebranch', 1, $borrower_branchcode, $borrower_branchcode); @@ -118,7 +119,7 @@ $dbh->do("DELETE FROM hold_fill_targets"); $dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode' AND holdingbranch = '$borrower_branchcode')"); $dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode' AND holdingbranch = '$borrower_branchcode'"); # test_queue will flush -$dbh->do("UPDATE systempreferences SET value = 1 WHERE variable = 'AutomaticItemReturn'"); +C4::Context->set_preference('AutomaticItemReturn', 1); # Not sure how to make this test more difficult - holding branch does not matter test_queue ('take from holdingbranch AutomaticItemReturn on', 0, $borrower_branchcode, undef); test_queue ('take from holdingbranch AutomaticItemReturn on', 1, $borrower_branchcode, $least_cost_branch_code); @@ -127,7 +128,7 @@ $dbh->do("DELETE FROM tmp_holdsqueue"); $dbh->do("DELETE FROM hold_fill_targets"); $dbh->do("DELETE FROM issues WHERE itemnumber IN (SELECT itemnumber FROM items WHERE homebranch = '$borrower_branchcode')"); $dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode'"); -$dbh->do("UPDATE systempreferences SET value = 0 WHERE variable = 'AutomaticItemReturn'"); +C4::Context->set_preference('AutomaticItemReturn', 0); # We have a book available held in borrower branch test_queue ('take from holdingbranch', 0, $borrower_branchcode, $borrower_branchcode); test_queue ('take from holdingbranch', 1, $borrower_branchcode, $borrower_branchcode); -- 1.7.10.4