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

(-)a/t/db_dependent/Letters.t (-9 / +7 lines)
Lines 921-927 subtest 'Test limit parameter for SendQueuedMessages' => sub { Link Here
921
921
922
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
922
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
923
923
924
    plan tests => 6;
924
    plan tests => 8;
925
925
926
    my $dbh = C4::Context->dbh;
926
    my $dbh = C4::Context->dbh;
927
927
Lines 949-961 subtest 'Test message_id parameter for SendQueuedMessages' => sub { Link Here
949
        'from_address'           => 'root@localhost.' # invalid KohaAdminEmailAddress
949
        'from_address'           => 'root@localhost.' # invalid KohaAdminEmailAddress
950
    };
950
    };
951
    my $message_id = C4::Letters::EnqueueLetter($my_message);
951
    my $message_id = C4::Letters::EnqueueLetter($my_message);
952
    throws_ok {
952
    my $processed = C4::Letters::SendQueuedMessages( { message_id => $message_id } );
953
        C4::Letters::SendQueuedMessages( { message_id => $message_id } );
953
    is( $processed, 1, 'Processed 1 message when one message_id passed' );
954
    } 'Koha::Exceptions::BadParameter',
955
    'Exception thrown if invalid email is passed';
956
    my $message_1 = C4::Letters::GetMessage($message_id);
954
    my $message_1 = C4::Letters::GetMessage($message_id);
957
    # FIXME must be 'failed'
955
    is( $message_1->{status}, 'failed', 'Invalid KohaAdminEmailAddress => status failed' );
958
    is( $message_1->{status}, 'pending', 'Invalid KohaAdminEmailAddress => status pending' );
956
    is( $message_1->{delivery_note}, "Invalid 'from' parameter: " . 'root@localhost.', 'Delivery note for invalid from address');
957
    is( $message_1->{error_code}, 'INVALID_EMAIL', 'Error code set correctly for invalid email parameter');
959
958
960
    $my_message->{from_address} = 'root@example.org'; # valid KohaAdminEmailAddress
959
    $my_message->{from_address} = 'root@example.org'; # valid KohaAdminEmailAddress
961
    $message_id = C4::Letters::EnqueueLetter($my_message);
960
    $message_id = C4::Letters::EnqueueLetter($my_message);
Lines 964-969 subtest 'Test message_id parameter for SendQueuedMessages' => sub { Link Here
964
        "SendQueuedMessages is using the mocked send_or_die routine";
963
        "SendQueuedMessages is using the mocked send_or_die routine";
965
    $message_1 = C4::Letters::GetMessage($message_1->{message_id});
964
    $message_1 = C4::Letters::GetMessage($message_1->{message_id});
966
    my $message_2 = C4::Letters::GetMessage($message_id);
965
    my $message_2 = C4::Letters::GetMessage($message_id);
967
    is( $message_1->{status}, 'pending', 'Message 1 status is unchanged' ); # Must be 'failed'
966
    is( $message_1->{status}, 'failed', 'Message 1 status is unchanged' );
968
    is( $message_2->{status}, 'sent', 'Valid KohaAdminEmailAddress => status sent' );
967
    is( $message_2->{status}, 'sent', 'Valid KohaAdminEmailAddress => status sent' );
969
};
968
};
970
- 

Return to bug 28803