Kyle M Hall
8c53454ab7
If an SMS::Send driver succeeds, it returns a value that evaluates to true. Every driver I've inspected uses croak when it encounters a failure state.
When an SMS message fails to send, code hard codes the failure code to NO_NOTES (No notes from SMS driver).
We should store the real error in `failure_code` and display that if the failure code doesn't match a known failure code.
Test Plan:
1) Apply this patch
2) Set SMSSendDriver to any value
3) Generate a pending sms message
4) Run the following query:
update message_queue set status = 'failed', failure_code = "This is a test";
5) View the patron's messages, note the delivery note contains the
contents of the failure code
6) Run the following query:
update message_queue set status = 'failed', failure_code = "SMS_SEND_DRIVER_MISSING";
7) Reload the patron's messages, not the delivery note is now "The SMS
driver could not be loaded".
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 8acdc1e8e9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
70 lines
2 KiB
Raku
Executable file
70 lines
2 KiB
Raku
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use t::lib::Mocks;
|
|
|
|
use Test::More tests => 8;
|
|
|
|
BEGIN {
|
|
use_ok( 'C4::SMS', qw( driver send_sms ) );
|
|
}
|
|
|
|
my $driver = 'my mock driver';
|
|
t::lib::Mocks::mock_preference( 'SMSSendDriver', $driver );
|
|
is( C4::SMS->driver(), $driver, 'driver returns the SMSSendDriver correctly' );
|
|
|
|
t::lib::Mocks::mock_preference( 'SMSSendUsername', 'username' );
|
|
t::lib::Mocks::mock_preference( 'SMSSendPassword', 'pwd' );
|
|
|
|
my ( $send_sms, $error ) = C4::SMS->send_sms();
|
|
is( $send_sms, undef, 'send_sms without arguments returns undef' );
|
|
|
|
($send_sms) = C4::SMS->send_sms(
|
|
{
|
|
destination => 'my destination',
|
|
}
|
|
);
|
|
is( $send_sms, undef, 'send_sms without message returns undef' );
|
|
|
|
($send_sms) = C4::SMS->send_sms(
|
|
{
|
|
message => 'my message',
|
|
}
|
|
);
|
|
is( $send_sms, undef, 'send_sms without destination returns undef' );
|
|
|
|
( $send_sms, $error ) = C4::SMS->send_sms(
|
|
{
|
|
destination => 'my destination',
|
|
message => 'my message',
|
|
driver => '',
|
|
}
|
|
);
|
|
is( $send_sms, undef, 'send_sms with an undef driver returns undef' );
|
|
is( $error, 'SMS_SEND_DRIVER_MISSING', 'Error code returned is SMS_SEND_DRIVER_MISSING' );
|
|
|
|
( $send_sms, $error ) = C4::SMS->send_sms(
|
|
{
|
|
destination => '+33123456789',
|
|
message => 'my message',
|
|
driver => 'Test',
|
|
}
|
|
);
|
|
is( $send_sms, 1, 'send_sms returns 1' );
|
|
|