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

(-)a/t/db_dependent/Circulation.t (-1 / +47 lines)
Lines 18-24 Link Here
18
use Modern::Perl;
18
use Modern::Perl;
19
use utf8;
19
use utf8;
20
20
21
use Test::More tests => 48;
21
use Test::More tests => 49;
22
use Test::Exception;
22
use Test::Exception;
23
use Test::MockModule;
23
use Test::MockModule;
24
use Test::Deep qw( cmp_deeply );
24
use Test::Deep qw( cmp_deeply );
Lines 36-41 use C4::Circulation; Link Here
36
use C4::Biblio;
36
use C4::Biblio;
37
use C4::Items;
37
use C4::Items;
38
use C4::Log;
38
use C4::Log;
39
use C4::Message;
39
use C4::Reserves;
40
use C4::Reserves;
40
use C4::Overdues qw(UpdateFine CalcFine);
41
use C4::Overdues qw(UpdateFine CalcFine);
41
use Koha::DateUtils;
42
use Koha::DateUtils;
Lines 46-51 use Koha::Checkouts; Link Here
46
use Koha::Patrons;
47
use Koha::Patrons;
47
use Koha::Holds;
48
use Koha::Holds;
48
use Koha::CirculationRules;
49
use Koha::CirculationRules;
50
use Koha::Patron::Message::Attributes;
51
use Koha::Patron::Message::Preferences;
49
use Koha::Subscriptions;
52
use Koha::Subscriptions;
50
use Koha::Account::Lines;
53
use Koha::Account::Lines;
51
use Koha::Account::Offsets;
54
use Koha::Account::Offsets;
Lines 3032-3037 subtest 'ItemsDeniedRenewal preference' => sub { Link Here
3032
    is( $idr_mayrenew, 0, 'Renewal blocked for empty string when "" in pref' );
3035
    is( $idr_mayrenew, 0, 'Renewal blocked for empty string when "" in pref' );
3033
};
3036
};
3034
3037
3038
subtest 'SendCirculationAlert test' => sub {
3039
    plan tests => 4;
3040
3041
    my $library = $builder->build( { source => 'Branch' } );
3042
    my $patron  = $builder->build( { source => 'Borrower' } );
3043
    my $attribute = Koha::Patron::Message::Attributes->find({
3044
        message_name => 'Item_Checkout',
3045
    });
3046
    Koha::Patron::Message::Preference->new({
3047
        borrowernumber => $patron->{'borrowernumber'},
3048
        message_attribute_id => $attribute->message_attribute_id,
3049
        days_in_advance => undef,
3050
        wants_digest => 0,
3051
        message_transport_types => ['email'],
3052
    })->store;
3053
    my $biblioitem_1 = $builder->build( { source => 'Biblioitem' } );
3054
    my $item_1 = $builder->build(
3055
        {   source => 'Item',
3056
            value  => {
3057
                homebranch    => $library->{branchcode},
3058
                holdingbranch => $library->{branchcode},
3059
                notforloan    => 0,
3060
                itemlost      => 0,
3061
                withdrawn     => 0,
3062
                biblionumber  => $biblioitem_1->{biblionumber}
3063
            }
3064
        }
3065
    );
3066
3067
    my $old_message = C4::Message->find_last_message($patron, 'CHECKOUT', 'email');
3068
    $old_message->{'message_id'} = 0 unless $old_message;
3069
    is(C4::Circulation::SendCirculationAlert({
3070
        type     => 'CHECKOUT',
3071
        item     => $item_1,
3072
        borrower => $patron,
3073
        branch   => $library->{'branchcode'},
3074
    }), undef, "SendCirculationAlert called.");
3075
    my $new_message = C4::Message->find_last_message($patron, 'CHECKOUT', 'email');
3076
    ok($old_message->{'message_id'} != $new_message->{'message_id'}, "New message has appeared.");
3077
    is($new_message->{'letter_code'}, 'CHECKOUT', "New message letter code is CHECKOUT.");
3078
    is($new_message->{'borrowernumber'}, $patron->{'borrowernumber'}, "New message is to our test patron.");
3079
};
3080
3035
subtest 'CanBookBeIssued | item-level_itypes=biblio' => sub {
3081
subtest 'CanBookBeIssued | item-level_itypes=biblio' => sub {
3036
    plan tests => 2;
3082
    plan tests => 2;
3037
3083
(-)a/t/db_dependent/Reserves.t (-14 / +10 lines)
Lines 40-45 use Koha::Libraries; Link Here
40
use Koha::Notice::Templates;
40
use Koha::Notice::Templates;
41
use Koha::Patrons;
41
use Koha::Patrons;
42
use Koha::Patron::Categories;
42
use Koha::Patron::Categories;
43
use Koha::Patron::Message::Preference;
43
use Koha::CirculationRules;
44
use Koha::CirculationRules;
44
45
45
BEGIN {
46
BEGIN {
Lines 731-749 subtest '_koha_notify_reserve() tests' => sub { Link Here
731
732
732
    plan tests => 2;
733
    plan tests => 2;
733
734
734
    my $wants_hold_and_email = {
735
        wants_digest => '0',
736
        transports => {
737
            sms => 'HOLD',
738
            email => 'HOLD',
739
            },
740
        letter_code => 'HOLD'
741
    };
742
743
    my $mp = Test::MockModule->new( 'C4::Members::Messaging' );
744
745
    $mp->mock("GetMessagingPreferences",$wants_hold_and_email);
746
747
    $dbh->do('DELETE FROM letter');
735
    $dbh->do('DELETE FROM letter');
748
736
749
    my $email_hold_notice = $builder->build({
737
    my $email_hold_notice = $builder->build({
Lines 784-789 subtest '_koha_notify_reserve() tests' => sub { Link Here
784
        }
772
        }
785
    );
773
    );
786
774
775
    my $message_attr_id = Koha::Patron::Message::Attributes->find({
776
        message_name => 'Hold_Filled'
777
    })->message_attribute_id;
778
    Koha::Patron::Message::Preference->new({
779
        borrowernumber => $hold_borrower,
780
        message_attribute_id   => $message_attr_id,
781
        message_transport_types => ['sms', 'email'],
782
        wants_digest   => 0,
783
    })->store;
787
    ModReserveAffect($item->itemnumber, $hold_borrower, 0);
784
    ModReserveAffect($item->itemnumber, $hold_borrower, 0);
788
    my $sms_message_address = $schema->resultset('MessageQueue')->search({
785
    my $sms_message_address = $schema->resultset('MessageQueue')->search({
789
            letter_code     => 'HOLD',
786
            letter_code     => 'HOLD',
790
- 

Return to bug 18595