X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2FLetters.t;h=ad700266ba615179a9b707ebe947785fc6414b42;hb=7296706edc50a2954f2b77b3e10cf59d459c0572;hp=b269e866d87f7ddeb13a33e30d689dc74447b5cb;hpb=be12aa96094ab003949c78e8246db56027931cac;p=koha.git

diff --git a/t/Letters.t b/t/Letters.t
index b269e866d8..ad700266ba 100755
--- a/t/Letters.t
+++ b/t/Letters.t
@@ -1,36 +1,63 @@
 #!/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.
 #
-# This Koha test module is a stub!
-# Add more tests here!!!
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
+
+use DBI;
 use Test::MockModule;
-use Test::More tests => 2;
-
-BEGIN {
-    use_ok('C4::Letters');
-}
-
-my $module = new Test::MockModule('C4::Context');
-$module->mock(
-    '_new_dbh',
-    sub {
-        my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
-          || die "Cannot create handle: $DBI::errstr\n";
-        return $dbh;
-    }
-);
-my $mock_letters = [
-    [ 'module', 'code', 'branchcode', 'name', 'is_html', 'title', 'content' ],
-    [ 'blah',   'ISBN', 'NBSI',       'book', 1,         'green', 'blahblah' ],
-    [ 'bleh',   'ISSN', 'NSSI',       'page', 0,         'blue',  'blehbleh' ]
-];
-
-my $dbh = C4::Context->dbh();
-
-$dbh->{mock_add_resultset} = $mock_letters;
+use Test::More tests => 6;
+
+use Test::DBIx::Class {
+    schema_class => 'Koha::Schema',
+    connect_info => ['dbi:SQLite:dbname=:memory:','',''],
+    connect_opts => { name_sep => '.', quote_char => '`', },
+    fixture_class => '::Populate',
+}, 'Letter' ;
+use t::lib::Mocks;
+
+fixtures_ok [
+    Letter => [
+        [ 'module', 'code', 'branchcode', 'name', 'is_html', 'title', 'content' ],
+        [ 'blah',   'ISBN', 'NBSI',       'book', 1,         'green', 'blahblah' ],
+        [ 'bleh',   'ISSN', 'NSSI',       'page', 0,         'blue',  'blehbleh' ]
+    ],
+], 'add fixtures';
+
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock( _new_schema => sub { return Schema(); } );
+
+use_ok('C4::Letters');
+
+t::lib::Mocks::mock_preference('dateformat', 'metric');
 
 my $letters = C4::Letters::GetLetters();
 
-is( $letters->{ISBN}, 'book', 'HASH ref of ISBN is book' );
+my ( $ISBN_letter ) = grep {$_->{code} eq 'ISBN'} @$letters;
+is( $ISBN_letter->{name}, 'book', 'letter name for "ISBN" letter is book' );
+is( scalar( @$letters ), 2, 'GetLetters returns the 2 inserted letters' );
+
+# Regression test for bug 10843
+# $dt->add takes a scalar, not undef
+my $letter;
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', undef);
+$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
+is( ref($letter), 'HASH');
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
+$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
+is( ref($letter), 'HASH');
+
+1;