From 5b807fd3d75e059ad8ea48c126b3aaf2b68a26e9 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 5 Nov 2018 08:51:32 +0000 Subject: [PATCH] Bug 20996: (follow-up) Fix test - Fixes the t/db_dependent/Illrequest/Config.t - Adds tests for Koha::Illrequest::Config->has_branch 0) Do not apply the path 1) Run test t/db_dependent/Illrequest/Config.t 2) It fails - it is because the Koha/Illrequest/Config.pm prefixes handling changed 3) Apply the patch 4) Run test again, it should pass now 5) Read through the test code and confirm it makes sense Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens --- t/db_dependent/Illrequest/Config.t | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/t/db_dependent/Illrequest/Config.t b/t/db_dependent/Illrequest/Config.t index 3f26c6b855..b80babdc8a 100644 --- a/t/db_dependent/Illrequest/Config.t +++ b/t/db_dependent/Illrequest/Config.t @@ -410,7 +410,7 @@ subtest '_load_configuration' => sub { subtest 'Final tests' => sub { - plan tests => 10; + plan tests => 9; $schema->storage->txn_begin; @@ -419,12 +419,11 @@ subtest 'Final tests' => sub { my $config = Koha::Illrequest::Config->new; # getPrefixes (error & undef): - dies_ok( sub { $config->getPrefixes("FOO") }, "getPrefixes: die if not correct type."); - is_deeply($config->getPrefixes("brw_cat"), { default => undef}, - "getPrefixes: Undefined brw_cat prefix is undefined."); - is_deeply($config->getPrefixes("branch"), { default => undef}, + is($config->getPrefixes(), undef, "getPrefixes: Undefined branch prefix is undefined."); + is($config->has_branch(), undef, "Config does not have branch when no config loaded"); + # getDigitalRecipients (error & undef): dies_ok( sub { $config->getDigitalRecipients("FOO") }, "getDigitalRecipients: die if not correct type."); @@ -449,11 +448,8 @@ subtest 'Final tests' => sub { ); # getPrefixes (values): - is_deeply($config->getPrefixes("brw_cat"), - { B => '2-prefix', default => 'DEFAULT-prefix' }, - "getPrefixes: return configuration brw_cat prefixes."); - is_deeply($config->getPrefixes("branch"), - { 1 => 'T-prefix', default => 'DEFAULT-prefix' }, + is_deeply($config->getPrefixes(), + { '1' => 'T-prefix' }, "getPrefixes: return configuration branch prefixes."); # getDigitalRecipients (values): @@ -464,6 +460,9 @@ subtest 'Final tests' => sub { { 2 => 'borrower', default => 'branch' }, "getDigitalRecipients: return branch digital_recipients."); + # has_branch test + ok($config->has_branch(), "has_branch returns true if branch defined in configuration"); + $schema->storage->txn_rollback; }; -- 2.39.5