Bugzilla – Attachment 69127 Details for
Bug 18547
On shelf holds allowed > "If all unavailable" ignores default hold policy
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18547: QA Followup
Bug-18547-QA-Followup.patch (text/plain), 7.65 KB, created by
Nick Clemens (kidclamp)
on 2017-11-13 15:38:43 UTC
(
hide
)
Description:
Bug 18547: QA Followup
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2017-11-13 15:38:43 UTC
Size:
7.65 KB
patch
obsolete
>From cb859f5ee34888c71bff1353d83cdf107eb9bd26 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 13 Nov 2017 15:34:53 +0000 >Subject: [PATCH] Bug 18547: QA Followup > >Added comments to make clearer > >Tests had some confusion with names and results, though they do seem to >cover the changes here. > >I believe the tests highlight that ReserveControlBranch has no effect, >and possibly it should? Beyond the scope here but left those tests >for future work to be done > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > .../Holds/DisallowHoldIfItemsAvailable.t | 34 +++++++++++++++------- > 1 file changed, 24 insertions(+), 10 deletions(-) > >diff --git a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t >index ef498d8..3c5fd72 100755 >--- a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t >+++ b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t >@@ -131,11 +131,18 @@ AddReturn( $item1->{barcode} ); > my $sth_delete_rules = $dbh->prepare(q|DELETE FROM default_circ_rules|); > my $sth_insert_rule = $dbh->prepare(q|INSERT INTO default_circ_rules(singleton, maxissueqty, maxonsiteissueqty, holdallowed, hold_fulfillment_policy, returnbranch) VALUES ('singleton', NULL, NULL, ?, 'any', 'homebranch');|); > >- subtest 'Item is checked out from the same library' => sub { >+ subtest 'Item is available at a different library' => sub { > plan tests => 4; > > Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_B, holdingbranch => $library_B })->store; > $item1 = GetItem( $itemnumber1 ); >+ #Scenario is: >+ #One shelf holds is 'If all unavailable'/2 >+ #Item 1 homebranch library B is available >+ #Item 2 homebranch library A is checked out >+ #Borrower1 is from library A >+ #CircControl has no effect - same rule for all branches as set at line 96 >+ #FIXME: ReservesControlBranch is not checked in these subs we are testing > > { > $sth_delete_rules->execute; >@@ -143,11 +150,11 @@ AddReturn( $item1->{barcode} ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 1, "Hold allowed from home library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 1, "Hold allowed from home library + ReservesControlBranch=ItemHomeLibrary, One item is available at different library, not holdable = none available => the hold is allowed at item level" ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'PatronLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 1, "Hold allowed from home library + ReservesControlBranch=PatronLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 1, "Hold allowed from home library + ReservesControlBranch=PatronLibrary, One item is available at different library, not holdable = none available => the hold is allowed at item level" ); > } > > { >@@ -156,19 +163,26 @@ AddReturn( $item1->{barcode} ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from any library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from any library + ReservesControlBranch=ItemHomeLibrary, One item is available at the diff library, holdable = 1 available => the hold is not allowed at item level" ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'PatronLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from any library + ReservesControlBranch=PatronLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from any library + ReservesControlBranch=PatronLibrary, One item is available at the diff library, holdable = 1 available => the hold is not allowed at item level" ); > } > }; > >- subtest 'Item is checked out from the another library' => sub { >+ subtest 'Item is available at the same library' => sub { > plan tests => 4; > > Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_A, holdingbranch => $library_A })->store; > $item1 = GetItem( $itemnumber1 ); >+ #Scenario is: >+ #One shelf holds is 'If all unavailable'/2 >+ #Item 1 homebranch library A is available >+ #Item 2 homebranch library A is checked out >+ #Borrower1 is from library A >+ #CircControl has no effect - same rule for all branches as set at line 96 >+ #ReservesControlBranch is not checked in these subs we are testing? > > { > $sth_delete_rules->execute; >@@ -176,11 +190,11 @@ AddReturn( $item1->{barcode} ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from home library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from home library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library, holdable = 1 available => the hold is not allowed at item level" ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'PatronLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from home library + ReservesControlBranch=PatronLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from home library + ReservesControlBranch=PatronLibrary, One item is available at the same library, holdable = 1 available => the hold is not allowed at item level" ); > } > > { >@@ -189,11 +203,11 @@ AddReturn( $item1->{barcode} ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from any library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from any library + ReservesControlBranch=ItemHomeLibrary, One item is available at the same library, holdable = 1 available => the hold is not allowed at item level" ); > > t::lib::Mocks::mock_preference('ReservesControlBranch', 'PatronLibrary'); > $is = IsAvailableForItemLevelRequest( $item1, $borrower1); >- is( $is, 0, "Hold allowed from any library + ReservesControlBranch=PatronLibrary, One item is available at the same library => the hold is allowed at item level" ); >+ is( $is, 0, "Hold allowed from any library + ReservesControlBranch=PatronLibrary, One item is available at the same library, holdable = 1 available => the hold is not allowed at item level" ); > } > }; > }; >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18547
:
63157
|
63227
|
66675
|
68854
|
69125
|
69126
| 69127