From 3f84cc0dea61437cc4b799443295359971ebb7e2 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 19 Jun 2019 15:38:20 -0300 Subject: [PATCH] Bug 21073: (QA follow-up) Fix plugin-related tests Signed-off-by: Tomas Cohen Arazi --- t/db_dependent/ImportBatch.t | 5 ++++- t/db_dependent/Koha/REST/Plugin/PluginRoutes.t | 10 ++++++++-- t/db_dependent/Koha/Template/Plugin/KohaPlugins.t | 4 +++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/ImportBatch.t b/t/db_dependent/ImportBatch.t index bcc25ef9d1..676d2fda89 100644 --- 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 cc50b56b90..197a28d016 100644 --- 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 5ecc1cdb37..f0ff5b39b5 100755 --- 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' ); -- 2.22.0