@@ -, +, @@ --- t/db_dependent/ImportBatch.t | 7 ++++--- t/db_dependent/Koha/Plugins/authority_hooks.t | 2 +- t/db_dependent/Koha/REST/Plugin/PluginRoutes.t | 2 +- t/db_dependent/Koha/Template/Plugin/KohaPlugins.t | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) --- a/t/db_dependent/ImportBatch.t +++ a/t/db_dependent/ImportBatch.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use Modern::Perl; -use Test::More tests => 16; +use Test::More tests => 17; use utf8; use File::Basename; use File::Temp qw/tempfile/; @@ -10,12 +10,13 @@ use t::lib::Mocks; use t::lib::TestBuilder; use Koha::Database; -use Koha::Plugins; BEGIN { # Mock pluginsdir before loading Plugins module - my $path = dirname(__FILE__) . '/../lib'; + my $path = dirname(__FILE__) . '/../lib/plugins'; t::lib::Mocks::mock_config( 'pluginsdir', $path ); + + use_ok('Koha::Plugins'); use_ok('C4::ImportBatch', qw( AddImportBatch GetImportBatch AddBiblioToBatch AddItemsToImportBiblio GetRecordFromImportBiblio SetMatchedBiblionumber GetImportBiblios GetItemNumbersFromImportBatch CleanBatch DeleteBatch RecordsFromMarcPlugin )); } --- a/t/db_dependent/Koha/Plugins/authority_hooks.t +++ a/t/db_dependent/Koha/Plugins/authority_hooks.t @@ -30,7 +30,7 @@ use t::lib::TestBuilder; BEGIN { # Mock pluginsdir before loading Plugins module - my $path = dirname(__FILE__) . '/../../../lib'; + my $path = dirname(__FILE__) . '/../../../lib/plugins'; t::lib::Mocks::mock_config( 'pluginsdir', $path ); use_ok('Koha::Plugins'); --- a/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t +++ a/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t @@ -32,7 +32,7 @@ use Mojolicious::Lite; BEGIN { # Mock pluginsdir before loading Plugins module - my $path = dirname(__FILE__) . '/../../../../lib'; + my $path = dirname(__FILE__) . '/../../../../lib/plugins'; t::lib::Mocks::mock_config( 'pluginsdir', $path ); } --- a/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t +++ a/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t @@ -16,7 +16,7 @@ use C4::Context; use t::lib::Mocks; BEGIN { - push( @INC, dirname(__FILE__) . '/../../../../lib' ); + push( @INC, dirname(__FILE__) . '/../../../../lib/plugins' ); use_ok('Koha::Plugins'); use_ok('Koha::Plugins::Handler'); --