Bug 21073: (QA follow-up) Fix plugin-related tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/t/db_dependent/ImportBatch.t b/t/db_dependent/ImportBatch.t
index bcc25ef..676d2fd 100644 (file)
--- a/t/db_dependent/ImportBatch.t
+++ b/t/db_dependent/ImportBatch.t
@@ -188,7 +188,10 @@ subtest "RecordsFromMarcPlugin" => sub {
 
     t::lib::Mocks::mock_config( 'enable_plugins', 1 );
     t::lib::Mocks::mock_preference( 'UseKohaPlugins', 1 );
-    my ($plugin) = Koha::Plugins->new->GetPlugins({ all => 1, metadata => { name => 'MarcFieldValues' } });
+
+    my $plugins = Koha::Plugins->new;
+    $plugins->InstallPlugins;
+    my ($plugin) = $plugins->GetPlugins({ all => 1, metadata => { name => 'MarcFieldValues' } });
     isnt( $plugin, undef, "Plugin found" );
     my $records = C4::ImportBatch::RecordsFromMarcPlugin( $name, ref $plugin, 'UTF-8' );
     is( @$records, 2, 'Two results returned' );

diff --git a/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t b/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
index cc50b56..197a28d 100644 (file)
--- a/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
+++ b/t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
@@ -50,7 +50,10 @@ subtest 'Bad plugins tests' => sub {
     t::lib::Mocks::mock_config( 'enable_plugins', 1 );
     t::lib::Mocks::mock_preference( 'UseKohaPlugins', 1 );
 
-    my @plugins = Koha::Plugins->new->GetPlugins( { all => 1 } );
+    my $plugins = Koha::Plugins->new;
+    $plugins->InstallPlugins;
+
+    my @plugins = $plugins->GetPlugins( { all => 1 } );
     foreach my $plugin (@plugins) {
         $plugin->enable;
     }
@@ -81,7 +84,10 @@ subtest 'Disabled plugins tests' => sub {
 
     my $good_plugin;
 
-    my @plugins = Koha::Plugins->new->GetPlugins( { all => 1 } );
+    my $plugins = Koha::Plugins->new;
+    $plugins->InstallPlugins;
+
+    my @plugins = $plugins->GetPlugins( { all => 1 } );
     foreach my $plugin (@plugins) {
         $plugin->disable;
         $good_plugin = $plugin

diff --git a/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t b/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t
index 5ecc1cd..f0ff5b3 100755 (executable)
--- a/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t
+++ b/t/db_dependent/Koha/Template/Plugin/KohaPlugins.t
@@ -31,7 +31,9 @@ my $schema = Koha::Database->new->schema;
 $schema->storage->txn_begin;
 
 # Enable all plugins
-my @plugins = Koha::Plugins->new->GetPlugins({ all => 1, class => 'Koha::Plugin::Test' });
+my $plugins = Koha::Plugins->new;
+$plugins->InstallPlugins;
+my @plugins = $plugins->GetPlugins({ all => 1, class => 'Koha::Plugin::Test' });
 map { $_->enable; } @plugins;
 
 my $mock_plugin = Test::MockModule->new( 'Koha::Plugin::Test' );