From ce44bff548761cbf43091dc039181095874f1ff2 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 1 Mar 2017 10:40:20 +0000
Subject: [PATCH] Bug 14576 - (QA Followup) Fix Returns.t

Two warnings, not one
---
 t/db_dependent/Circulation/Returns.t | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/t/db_dependent/Circulation/Returns.t b/t/db_dependent/Circulation/Returns.t
index ce52740..61cefc6 100644
--- a/t/db_dependent/Circulation/Returns.t
+++ b/t/db_dependent/Circulation/Returns.t
@@ -124,9 +124,9 @@ subtest "AddReturn logging on statistics table (item-level_itypes=1)" => sub {
     warning_like { AddIssue( $borrower, $item_without_itemtype->{ barcode } ) }
                  qr/^item-level_itypes set but no itemtype set for item/,
                  'Item without itemtype set raises warning on AddIssue';
-    warning_like { AddReturn( $item_without_itemtype->{ barcode }, $branch ) }
-                 qr/^item-level_itypes set but no itemtype set for item/,
-                 'Item without itemtype set raises warning on AddReturn';
+    warnings_like { AddReturn( $item_without_itemtype->{ barcode }, $branch ) }
+                [qr/^item-level_itypes set but no itemtype set for item/,qr/^item-level_itypes set but no itemtype set for item/],
+                 'Item without itemtype set raises warnings on AddReturn';
     # Test biblio-level itemtype was recorded on the 'statistics' table
     $stat = $schema->resultset('Statistic')->search({
         branch     => $branch,
@@ -246,5 +246,6 @@ subtest 'Handle ids duplication' => sub {
     my $old_checkout = Koha::Old::Checkouts->find( $checkout->issue_id );
     isnt( $old_checkout->itemnumber, $item->{itemnumber}, 'If an item is checked-in, it should be moved to old_issues even if the issue_id already existed in the table' );
 };
+$schema->storage->txn_rollback;
 
 1;
-- 
2.1.4