gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 12027: (QA follow-up) Update tests 

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2017-04-28 15:23:18 +01:00 committed by Nick Clemens
parent 0aa69ea795
commit 142230bdde
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C4/Auth_with_shibboleth.pm
View File

@ -134,7 +134,6 @@ sub _get_uri {
my $interface = C4::Context->interface;
$debug and warn "shibboleth interface: " . $interface;
my $return;
my $uri;
if ( $interface eq 'intranet' ) {

63
t/Auth_with_shibboleth.t
View File

@ -28,13 +28,17 @@ use C4::Context;
BEGIN {
if ( check_install( module => 'Test::DBIx::Class' ) ) {
plan tests => 11;
} else {
plan skip_all => "Need Test::DBIx::Class"
plan tests => 17;
}
else {
plan skip_all => "Need Test::DBIx::Class";
}
}
use Test::DBIx::Class;
use Test::DBIx::Class {
schema_class => 'Koha::Schema',
connect_info => [ 'dbi:SQLite:dbname=:memory:', '', '' ]
};
# Mock Variables
my $matchpoint = 'userid';
@ -63,11 +67,16 @@ $context->mock( 'config', \&mockedConfig );
### Mock ->preference
my $OPACBaseURL = "testopac.com";
my $staffClientBaseURL = "teststaff.com";
$context->mock( 'preference', \&mockedPref );
### Mock ->tz
$context->mock( 'timezone', sub { return 'local'; } );
### Mock ->interface
my $interface = 'opac';
$context->mock( 'interface', \&mockedInterface );
## Mock Database
my $database = new Test::MockModule('Koha::Database');
@ -250,15 +259,17 @@ subtest "checkpw_shib tests" => sub {
};
## _get_uri
## _get_uri - opac
$OPACBaseURL = "testopac.com";
is( C4::Auth_with_shibboleth::_get_uri(),
"https://testopac.com", "https opac uri returned" );
$OPACBaseURL = "http://testopac.com";
my $result;
warning_like { $result = C4::Auth_with_shibboleth::_get_uri() }
[qr/Shibboleth requires OPACBaseURL to use the https protocol!/],
warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() }[
"shibboleth interface: $interface",
"Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!"
],
"improper protocol - received expected warning";
is( $result, "https://testopac.com", "https opac uri returned" );
@ -267,10 +278,34 @@ is( C4::Auth_with_shibboleth::_get_uri(),
"https://testopac.com", "https opac uri returned" );
$OPACBaseURL = undef;
warning_like { $result = C4::Auth_with_shibboleth::_get_uri() }
[qr/OPACBaseURL not set!/],
warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() }
[ "shibboleth interface: $interface", "OPACBaseURL not set!" ],
"undefined OPACBaseURL - received expected warning";
is( $result, "https://", "https opac uri returned" );
is( $result, "https://", "https $interface uri returned" );
## _get_uri - intranet
$interface = 'intranet';
$staffClientBaseURL = "teststaff.com";
is( C4::Auth_with_shibboleth::_get_uri(),
"https://teststaff.com", "https $interface uri returned" );
$staffClientBaseURL = "http://teststaff.com";
warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() }[
"shibboleth interface: $interface",
"Shibboleth requires OPACBaseURL/staffClientBaseURL to use the https protocol!"
],
"improper protocol - received expected warning";
is( $result, "https://teststaff.com", "https $interface uri returned" );
$staffClientBaseURL = "https://teststaff.com";
is( C4::Auth_with_shibboleth::_get_uri(),
"https://teststaff.com", "https $interface uri returned" );
$staffClientBaseURL = undef;
warnings_are { $result = C4::Auth_with_shibboleth::_get_uri() }
[ "shibboleth interface: $interface", "staffClientBaseURL not set!" ],
"undefined staffClientBaseURL - received expected warning";
is( $result, "https://", "https $interface uri returned" );
## _get_shib_config
# Internal helper function, covered in tests above
@ -295,9 +330,17 @@ sub mockedPref {
$return = $OPACBaseURL;
}
if ( $param eq 'staffClientBaseURL' ) {
$return = $staffClientBaseURL;
}
return $return;
}
sub mockedInterface {
return $interface;
}
sub mockedSchema {
return Schema();
}