Bugzilla – Attachment 98344 Details for
Bug 18936
Move issuingrules into circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18936: (QA follow-up) Convert remaining tests to use Koha::CirculationRules
Bug-18936-QA-follow-up-Convert-remaining-tests-to-.patch (text/plain), 3.23 KB, created by
Jonathan Druart
on 2020-02-03 16:09:46 UTC
(
hide
)
Description:
Bug 18936: (QA follow-up) Convert remaining tests to use Koha::CirculationRules
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-02-03 16:09:46 UTC
Size:
3.23 KB
patch
obsolete
>From f535dff2ef28a9cfe85e8d1e48751c6478dbc8c4 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi> >Date: Mon, 3 Feb 2020 10:20:17 +0000 >Subject: [PATCH] Bug 18936: (QA follow-up) Convert remaining tests to use > Koha::CirculationRules >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >These two uses of Koha::IssuingRule were forgotten so this converts >them to use the new Koha::CirculationRules object. > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> >--- > t/db_dependent/SIP/Transaction.t | 49 ++++++++++++++++++++++++---------------- > 1 file changed, 29 insertions(+), 20 deletions(-) > >diff --git a/t/db_dependent/SIP/Transaction.t b/t/db_dependent/SIP/Transaction.t >index c33ba31670..3e8edbf60f 100755 >--- a/t/db_dependent/SIP/Transaction.t >+++ b/t/db_dependent/SIP/Transaction.t >@@ -16,6 +16,7 @@ use C4::SIP::ILS::Transaction::FeePayment; > use C4::SIP::ILS::Transaction::Hold; > > use C4::Reserves; >+use Koha::CirculationRules; > > my $schema = Koha::Database->new->schema; > $schema->storage->txn_begin; >@@ -65,16 +66,20 @@ subtest fill_holds_at_checkout => sub { > } > }); > >- Koha::IssuingRule->new({ >- categorycode => $borrower->{categorycode}, >- itemtype => $itype->{itemtype}, >- branchcode => $branch->{branchcode}, >- onshelfholds => 1, >- reservesallowed => 3, >- holds_per_record => 3, >- issuelength => 5, >- lengthunit => 'days', >- })->store; >+ Koha::CirculationRules->set_rules( >+ { >+ categorycode => $borrower->{categorycode}, >+ branchcode => $branch->{branchcode}, >+ itemtype => $itype->{itemtype}, >+ rules => { >+ onshelfholds => 1, >+ reservesallowed => 3, >+ holds_per_record => 3, >+ issuelength => 5, >+ lengthunit => 'days', >+ } >+ } >+ ); > > my $reserve1 = AddReserve($branch->{branchcode},$borrower->{borrowernumber},$biblio->{biblionumber}); > my $reserve2 = AddReserve($branch->{branchcode},$borrower->{borrowernumber},$biblio->{biblionumber}); >@@ -154,16 +159,20 @@ subtest cancel_hold => sub { > library => $library->branchcode, > }); > >- Koha::IssuingRule->new({ >- categorycode => $patron->categorycode, >- itemtype => $item->effective_itemtype, >- branchcode => $library->branchcode, >- onshelfholds => 1, >- reservesallowed => 3, >- holds_per_record => 3, >- issuelength => 5, >- lengthunit => 'days', >- })->store; >+ Koha::CirculationRules->set_rules( >+ { >+ categorycode => $patron->categorycode, >+ branchcode => $library->branchcode, >+ itemtype => $item->effective_itemtype, >+ rules => { >+ onshelfholds => 1, >+ reservesallowed => 3, >+ holds_per_record => 3, >+ issuelength => 5, >+ lengthunit => 'days', >+ } >+ } >+ ); > > my $reserve1 = > AddReserve( $library->branchcode, $patron->borrowernumber, >-- >2.11.0
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 18936
:
65247
|
65248
|
65249
|
67629
|
67758
|
68236
|
71034
|
71035
|
71036
|
71037
|
71038
|
71039
|
71040
|
71041
|
72230
|
72231
|
72232
|
72233
|
72234
|
72235
|
72236
|
72237
|
72238
|
91953
|
91954
|
91955
|
91956
|
91957
|
91958
|
91959
|
91960
|
91961
|
91962
|
91963
|
91964
|
91965
|
91966
|
91967
|
91968
|
91969
|
91970
|
91971
|
91972
|
91973
|
91974
|
91975
|
94179
|
94180
|
94181
|
94182
|
94183
|
94184
|
94185
|
94186
|
94187
|
94188
|
94189
|
94190
|
94191
|
94192
|
94193
|
94194
|
94195
|
94196
|
94197
|
94198
|
94199
|
94200
|
98299
|
98300
|
98301
|
98302
|
98303
|
98304
|
98305
|
98306
|
98307
|
98308
|
98309
|
98310
|
98311
|
98312
|
98313
|
98314
|
98315
|
98316
|
98317
|
98318
|
98319
|
98320
|
98321
|
98322
|
98323
|
98324
|
98325
|
98326
|
98327
|
98328
|
98329
|
98330
|
98331
|
98332
|
98333
|
98334
|
98335
|
98336
|
98337
|
98338
|
98339
|
98340
|
98341
|
98342
|
98343
| 98344 |
98345
|
98346
|
98347
|
98407
|
98408