View | Details | Raw Unified | Return to bug 14576
Collapse All | Expand All

(-)a/t/db_dependent/Circulation/Returns.t (-42 / +3 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 5;
20
use Test::More tests => 4;
21
use Test::MockModule;
21
use Test::MockModule;
22
use Test::Warn;
22
use Test::Warn;
23
23
Lines 60-106 my $rule = Koha::IssuingRule->new( Link Here
60
);
60
);
61
$rule->store();
61
$rule->store();
62
62
63
subtest "InProcessingToShelvingCart tests" => sub {
64
65
    plan tests => 2;
66
67
    $branch = $builder->build({ source => 'Branch' })->{ branchcode };
68
    my $permanent_location = 'TEST';
69
    my $location           = 'PROC';
70
71
    # Create a biblio record with biblio-level itemtype
72
    my $record = MARC::Record->new();
73
    my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $record, '' );
74
    my $built_item = $builder->build({
75
        source => 'Item',
76
        value  => {
77
            biblionumber  => $biblionumber,
78
            homebranch    => $branch,
79
            holdingbranch => $branch,
80
            location      => $location,
81
            permanent_location => $permanent_location
82
        }
83
    });
84
    my $barcode = $built_item->{ barcode };
85
    my $itemnumber = $built_item->{ itemnumber };
86
    my $item;
87
88
    t::lib::Mocks::mock_preference( "InProcessingToShelvingCart", 1 );
89
    AddReturn( $barcode, $branch );
90
    $item = GetItem( $itemnumber );
91
    is( $item->{location}, 'CART',
92
        "InProcessingToShelvingCart functions as intended" );
93
94
    $item->{location} = $location;
95
    ModItem( $item, undef, $itemnumber );
96
97
    t::lib::Mocks::mock_preference( "InProcessingToShelvingCart", 0 );
98
    AddReturn( $barcode, $branch );
99
    $item = GetItem( $itemnumber );
100
    is( $item->{location}, $permanent_location,
101
        "InProcessingToShelvingCart functions as intended" );
102
};
103
104
63
105
subtest "AddReturn logging on statistics table (item-level_itypes=1)" => sub {
64
subtest "AddReturn logging on statistics table (item-level_itypes=1)" => sub {
106
65
Lines 368-370 subtest 'BlockReturnOfLostItems' => sub { Link Here
368
    ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
327
    ( $doreturn, $messages, $issue ) = AddReturn($item->barcode);
369
    is( $doreturn, 1, "Without BlockReturnOfLostItems, a checkin of a lost item should not be blocked");
328
    is( $doreturn, 1, "Without BlockReturnOfLostItems, a checkin of a lost item should not be blocked");
370
};
329
};
330
331
$schema->storage->txn_rollback;
(-)a/t/db_dependent/Circulation/issue.t (-1 / +53 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 32;
20
use Test::More tests => 44;
21
use DateTime::Duration;
21
use DateTime::Duration;
22
22
23
use t::lib::Mocks;
23
use t::lib::Mocks;
Lines 370-375 AddReturn( 'barcode_3', $branchcode_1 ); Link Here
370
$item = GetItem( $itemnumber );
370
$item = GetItem( $itemnumber );
371
ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
371
ok( $item->{notforloan} eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
372
372
373
my $itemnumber2;
374
($biblionumber, $biblioitemnumber, $itemnumber2) = C4::Items::AddItem(
375
    {
376
        barcode        => 'barcode_4',
377
        itemcallnumber => 'callnumber4',
378
        homebranch     => $branchcode_1,
379
        holdingbranch  => $branchcode_1,
380
        location => 'FIC',
381
        itype          => $itemtype
382
    },
383
    $biblionumber
384
);
385
386
t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', q{} );
387
AddReturn( 'barcode_4', $branchcode_1 );
388
my $item2 = GetItem( $itemnumber2 );
389
ok( $item2->{location} eq 'FIC', 'UpdateItemLocationOnCheckin does not modify value when not enabled' );
390
391
t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', 'FIC: GEN' );
392
AddReturn( 'barcode_4', $branchcode_1 );
393
$item2 = GetItem( $itemnumber2 );
394
ok( $item2->{location} eq 'GEN', q{UpdateItemLocationOnCheckin updates location value from 'FIC' to 'GEN' with setting "FIC: GEN"} );
395
ok( $item2->{permanent_location} eq 'GEN', q{UpdateItemLocationOnCheckin updates permanent_location value from 'FIC' to 'GEN' with setting "FIC: GEN"} );
396
AddReturn( 'barcode_4', $branchcode_1 );
397
$item2 = GetItem( $itemnumber2 );
398
ok( $item2->{location} eq 'GEN', q{UpdateItemLocationOnCheckin does not update location value from 'GEN' with setting "FIC: GEN"} );
399
400
t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', '_ALL_: CART' );
401
AddReturn( 'barcode_4', $branchcode_1 );
402
$item2 = GetItem( $itemnumber2 );
403
ok( $item2->{location} eq 'CART', q{UpdateItemLocationOnCheckin updates location value from 'GEN' with setting "_ALL_: CART"} );
404
ok( $item2->{permanent_location} eq 'GEN', q{UpdateItemLocationOnCheckin does not update permanent_location value from 'GEN' with setting "_ALL_: CART"} );
405
AddIssue( $borrower_1, 'barcode_4', $daysago10,0, $today, '' );
406
$item2 = GetItem( $itemnumber2 );
407
ok( $item2->{location} eq 'GEN', q{Location updates from 'CART' to permanent location on issue} );
408
409
t::lib::Mocks::mock_preference( 'UpdateItemLocationOnCheckin', "GEN: _BLANK_\n_BLANK_: PROC\nPROC: _PERM_" );
410
AddReturn( 'barcode_4', $branchcode_1 );
411
$item2 = GetItem( $itemnumber2 );
412
ok( $item2->{location} eq '', q{UpdateItemLocationOnCheckin updates location value from 'GEN' to '' with setting "GEN: _BLANK_"} );
413
AddReturn( 'barcode_4', $branchcode_1 );
414
$item2 = GetItem( $itemnumber2 );
415
ok( $item2->{location} eq 'PROC' , q{UpdateItemLocationOnCheckin updates location value from '' to 'PROC' with setting "_BLANK_: PROC"} );
416
ok( $item2->{permanent_location} eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location value from '' to 'PROC' with setting "_BLANK_: PROC"} );
417
AddReturn( 'barcode_4', $branchcode_1 );
418
$item2 = GetItem( $itemnumber2 );
419
ok( $item2->{location} eq '' , q{UpdateItemLocationOnCheckin updates location value from 'PROC' to '' with setting "PROC: _PERM_" } );
420
ok( $item2->{permanent_location} eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location from '' with setting "PROC: _PERM_" } );
421
422
423
424
373
# Bug 14640 - Cancel the hold on checking out if asked
425
# Bug 14640 - Cancel the hold on checking out if asked
374
my $reserve_id = AddReserve($branchcode_1, $borrower_id1, $biblionumber,
426
my $reserve_id = AddReserve($branchcode_1, $borrower_id1, $biblionumber,
375
    undef,  1, undef, undef, "a note", "a title", undef, '');
427
    undef,  1, undef, undef, "a note", "a title", undef, '');
(-)a/t/db_dependent/UsageStats.t (-3 lines)
Lines 397-403 sub mocking_systempreferences_to_a_set_value { Link Here
397
        CircControl
397
        CircControl
398
        HomeOrHoldingBranch
398
        HomeOrHoldingBranch
399
        HomeOrHoldingBranchReturn
399
        HomeOrHoldingBranchReturn
400
        InProcessingToShelvingCart
401
        IssueLostItem
400
        IssueLostItem
402
        IssuingInProcess
401
        IssuingInProcess
403
        ManInvInNoissuesCharge
402
        ManInvInNoissuesCharge
Lines 406-412 sub mocking_systempreferences_to_a_set_value { Link Here
406
        RenewalSendNotice
405
        RenewalSendNotice
407
        RentalsInNoissuesCharge
406
        RentalsInNoissuesCharge
408
        ReturnBeforeExpiry
407
        ReturnBeforeExpiry
409
        ReturnToShelvingCart
410
        TransfersMaxDaysWarning
408
        TransfersMaxDaysWarning
411
        UseBranchTransferLimits
409
        UseBranchTransferLimits
412
        useDaysMode
410
        useDaysMode
413
- 

Return to bug 14576