Bug 15774: (follow-up) Address QA issues

[koha.git] / t / Letters.t

diff --git a/t/Letters.t b/t/Letters.t
index 18ae129..35a4b74 100755 (executable)
--- a/t/Letters.t
+++ b/t/Letters.t
@@ -17,30 +17,36 @@
 
 use Modern::Perl;
 
-use DBI;
 use Test::MockModule;
-use Test::More tests => 5;
-use t::lib::Mocks;
-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;
+use Test::More;
+
+use Module::Load::Conditional qw/check_install/;
+
+BEGIN {
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 6;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
     }
-);
-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' ]
-];
+}
 
-use_ok('C4::Letters');
+use Test::DBIx::Class;
+use t::lib::Mocks;
+
+fixtures_ok [
+    Letter => [
+        [ 'module', 'code', 'branchcode', 'name', 'is_html', 'title', 'content', 'lang' ],
+        [ 'blah',   'ISBN', 'NBSI',       'book', 1,         'green', 'blahblah', 'french' ],
+        [ 'bleh',   'ISSN', 'NSSI',       'page', 0,         'blue',  'blehbleh', 'american' ]
+    ],
+], 'add fixtures';
 
-my $dbh = C4::Context->dbh();
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock( _new_schema => sub { return Schema(); } );
+
+use_ok('C4::Letters');
 
-$dbh->{mock_add_resultset} = $mock_letters;
+t::lib::Mocks::mock_preference('dateformat', 'metric');
 
 my $letters = C4::Letters::GetLetters();
 
@@ -58,4 +64,3 @@ t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
 $letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
 is( ref($letter), 'HASH');
 
-1;