From 51495c79d393b91f9030308e8b115c3b92935484 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 4 May 2015 20:37:58 -0400 Subject: [PATCH] Bug 14111 - More t/Auth_with_shibboleth.t silencing TEST PLAN --------- 1) Apply first patch 2) prove t/Auth_with_shibboleth.t -- failed?! 3) apply this patch 4) prove t/Auth_with_shibboleth.t -- success. *whew* 5) koha-qa test tools. --- t/Auth_with_shibboleth.t | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/t/Auth_with_shibboleth.t b/t/Auth_with_shibboleth.t index 457153a..a20dff5 100644 --- a/t/Auth_with_shibboleth.t +++ b/t/Auth_with_shibboleth.t @@ -28,7 +28,7 @@ use C4::Context; BEGIN { if ( check_install( module => 'Test::DBIx::Class' ) ) { - plan tests => 9; + plan tests => 11; } else { plan skip_all => "Need Test::DBIx::Class" } @@ -249,10 +249,8 @@ is( C4::Auth_with_shibboleth::_get_uri(), $OPACBaseURL = "http://testopac.com"; my $result; -warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() } - [ { carped => - 'Shibboleth requires OPACBaseURL to use the https protocol!' }, - ], +warning_like { $result = C4::Auth_with_shibboleth::_get_uri() } + [ qr/Shibboleth requires OPACBaseURL to use the https protocol!/ ], "improper protocol - received expected warning"; is( $result, "https://testopac.com", "https opac uri returned" ); @@ -261,9 +259,8 @@ is( C4::Auth_with_shibboleth::_get_uri(), "https://testopac.com", "https opac uri returned" ); $OPACBaseURL = undef; -warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() } - [ { carped => 'OPACBaseURL not set!' }, - ], +warning_like { $result = C4::Auth_with_shibboleth::_get_uri() } + [ qr/OPACBaseURL not set!/ ], "undefined OPACBaseURL - received expected warning"; is( $result, "https://", "https opac uri returned" ); -- 2.1.4