@@ -, +, @@ --- t/db_dependent/Circulation/MarkIssueReturned.t | 16 ++++++++++++---- t/db_dependent/Suggestions.t | 22 ++++++++++++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) --- a/t/db_dependent/Circulation/MarkIssueReturned.t +++ a/t/db_dependent/Circulation/MarkIssueReturned.t @@ -174,10 +174,18 @@ subtest 'Manually pass a return date' => sub { $issue = C4::Circulation::AddIssue( $patron->unblessed, $item->barcode ); - throws_ok - { $issue_id = C4::Circulation::MarkIssueReturned( $patron->borrowernumber, $item->itemnumber, 'bad_date', 0 ); } - 'Koha::Exceptions::Object::BadValue', - 'An exception is thrown on bad date'; + { + # Hiding the expected warning displayed by DBI + # DBD::mysql::st execute failed: Incorrect datetime value: 'bad_date' for column 'returndate' + my $stderr; + local *STDERR; + open STDERR, '>', '/dev/null'; + throws_ok + { $issue_id = C4::Circulation::MarkIssueReturned( $patron->borrowernumber, $item->itemnumber, 'bad_date', 0 ); } + 'Koha::Exceptions::Object::BadValue', + 'An exception is thrown on bad date'; + close STDERR; + } $schema->storage->txn_rollback; }; --- a/t/db_dependent/Suggestions.t +++ a/t/db_dependent/Suggestions.t @@ -250,12 +250,22 @@ $messages = C4::Letters::GetQueuedMessages({ }); is ($messages->[0]->{message_transport_type}, 'email', 'When FallbackToSMSIfNoEmail syspref is enabled the suggestion message_transport_type is email if the borrower has an email'); -$mod_suggestion4->{manageddate} = 'invalid date!'; -ModSuggestion($mod_suggestion4); -$messages = C4::Letters::GetQueuedMessages({ - borrowernumber => $borrowernumber2 -}); -is (scalar(@$messages), 1, 'No new letter should have been generated if the update raised an error'); +{ + # Hiding the expected warning displayed by DBI + # DBD::mysql::st execute failed: Incorrect date value: 'invalid date!' for column 'manageddate' + my $stderr; + local *STDERR; + open STDERR, '>', '/dev/null'; + + $mod_suggestion4->{manageddate} = 'invalid date!'; + ModSuggestion($mod_suggestion4); + $messages = C4::Letters::GetQueuedMessages({ + borrowernumber => $borrowernumber2 + }); + + close STDERR; + is (scalar(@$messages), 1, 'No new letter should have been generated if the update raised an error'); +} is( GetSuggestionInfo(), undef, 'GetSuggestionInfo without the suggestion id returns undef' ); $suggestion = GetSuggestionInfo($my_suggestionid); --