From 1917e0c89fc275bf402b79ddad924b51731f47bf Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 10 Jul 2017 16:11:44 -0300
Subject: [PATCH] Bug 18851: Fix few other tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 t/Patron.t                         | 14 ++++++++++++--
 t/Search.t                         | 12 +++++++++++-
 t/SuggestionEngine_AuthorityFile.t | 14 +++++++++++++-
 t/XSLT.t                           |  2 ++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/t/Patron.t b/t/Patron.t
index be66f9d58e..3b879391ba 100755
--- a/t/Patron.t
+++ b/t/Patron.t
@@ -17,16 +17,26 @@
 
 use Modern::Perl;
 
-use Test::More tests => 11;
+use Test::More;
 use Test::Warn;
 use t::lib::Mocks;
 
+use Module::Load::Conditional qw/check_install/;
+
 BEGIN {
-    use Test::DBIx::Class;
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 11;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
+    }
     use_ok('Koha::Object');
     use_ok('Koha::Patron');
 }
 
+use Test::DBIx::Class;
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock( _new_schema => sub { return Schema(); } );
+
 my $object = Koha::Patron->new( { surname => 'Test Patron' } );
 is( $object->surname(), 'Test Patron', "Accessor returns correct value" );
 $object->surname('Test Patron Surname');
diff --git a/t/Search.t b/t/Search.t
index 5c3541983d..104e094a12 100755
--- a/t/Search.t
+++ b/t/Search.t
@@ -17,9 +17,19 @@
 
 use Modern::Perl;
 
-use Test::More tests => 3;
+use Test::More;
 use t::lib::Mocks;
 
+use Module::Load::Conditional qw/check_install/;
+
+BEGIN {
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 3;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
+    }
+}
+
 # Mock the DB connexion and C4::Context
 use Test::DBIx::Class;
 
diff --git a/t/SuggestionEngine_AuthorityFile.t b/t/SuggestionEngine_AuthorityFile.t
index 96ca44d98f..b648f319fa 100755
--- a/t/SuggestionEngine_AuthorityFile.t
+++ b/t/SuggestionEngine_AuthorityFile.t
@@ -28,8 +28,20 @@ use Test::More;
 use Test::MockModule;
 use t::lib::Mocks;
 
-# Mock the DB connexion and C4::Context
+use Module::Load::Conditional qw/check_install/;
+
+BEGIN {
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 3;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
+    }
+}
+
+# Mock the DB connexion
 use Test::DBIx::Class;
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock( _new_schema => sub { return Schema(); } );
 
 use_ok('Koha::SuggestionEngine');
 
diff --git a/t/XSLT.t b/t/XSLT.t
index aefa4df531..b902aa6d6b 100755
--- a/t/XSLT.t
+++ b/t/XSLT.t
@@ -36,6 +36,8 @@ BEGIN {
 };
 
 use Test::DBIx::Class;
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock( _new_schema => sub { return Schema(); } );
 
 my $dir = File::Temp->newdir();
 my @themes = ('prog', 'test');
-- 
2.39.2