From 5ab63dd0ce45b6f0e5f2d11ac955037ff967c2ab Mon Sep 17 00:00:00 2001 From: Srdjan Date: Thu, 2 Mar 2017 13:31:14 +1300 Subject: [PATCH] Bug 18243: 16034 follow-up: better handling of absence of WebService::ILS::OverDrive::Patron at testing To test: 1 - Make sure you don't have WebService::ILS::OverDrive::Patron installed 2 - prove t/Koha_ExternalContent_OverDrive.t 3 - You should get a failure to load module and tests are skipped 4 - Apply patch 5 - prove t/Koha_ExternalContent_OverDrive.t 6 - Module is not loaded, test are skipped Fixed small typo 'cannot filnd' -> 'cannot find' Signed-off-by: Nick Clemens --- t/Koha_ExternalContent_OverDrive.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/Koha_ExternalContent_OverDrive.t b/t/Koha_ExternalContent_OverDrive.t index de70b3d..5d2486f 100755 --- a/t/Koha_ExternalContent_OverDrive.t +++ b/t/Koha_ExternalContent_OverDrive.t @@ -3,11 +3,11 @@ use Modern::Perl; use t::lib::Mocks; use Test::More tests => 5; # last test to print -local $@; -eval { require WebService::ILS::OverDrive::Patron; } - or diag($@); +use Module::Load::Conditional qw( can_load ); + SKIP: { - skip "cannot filnd WebService::ILS::OverDrive::Patron", 5 if $@; + skip "cannot find WebService::ILS::OverDrive::Patron", 5 + unless can_load( modules => { 'WebService::ILS::OverDrive::Patron' => undef } ); use_ok('Koha::ExternalContent::OverDrive'); -- 2.1.4