From 679d0414a02d2704508aa9ff7fd0b528c7578013 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 7 Jun 2016 11:48:46 +0100
Subject: [PATCH] Bug 16441: Fix Letters.t
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

These tests were wrong, but the package variable used to cache the
letters hid the problem.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 687a7e22b6c630c3bbc06e1845854514f6fea5b0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a44040d07d24707d2cda51d989ad0fa495116608)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 t/db_dependent/Letters.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t
index 7b3ce25b87..e64cb6ffd2 100644
--- a/t/db_dependent/Letters.t
+++ b/t/db_dependent/Letters.t
@@ -316,7 +316,7 @@ $prepared_letter = GetPreparedLetter((
     substitute             => $substitute,
     repeat                 => $repeat,
 ));
-is( $prepared_letter->{content}, q|This one only contains the date: | . output_pref({ dt => $date, dateonly => 1 }) . q|.|, 'dateonly test 2' );
+is( $prepared_letter->{content}, q|And also this one:| . output_pref({ dt => $date, dateonly => 1 }) . q|.|, 'dateonly test 2' );
 
 $dbh->do(q{UPDATE letter SET content = 'And also this one:<<timestamp|dateonly >>.' WHERE code = 'test_date';});
 $prepared_letter = GetPreparedLetter((
@@ -327,7 +327,7 @@ $prepared_letter = GetPreparedLetter((
     substitute             => $substitute,
     repeat                 => $repeat,
 ));
-is( $prepared_letter->{content}, q|This one only contains the date: | . output_pref({ dt => $date, dateonly => 1 }) . q|.|, 'dateonly test 3' );
+is( $prepared_letter->{content}, q|And also this one:| . output_pref({ dt => $date, dateonly => 1 }) . q|.|, 'dateonly test 3' );
 
 $dbh->do(q{INSERT INTO letter (module, code, name, title, content) VALUES ('claimacquisition','TESTACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>|<<aqcontacts.name>>|<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered)</order>');});
 
-- 
2.39.5