Merge commit '469c2b72b4' into WebGUI8. All tests passing.
This commit is contained in:
commit
565cf955d7
147 changed files with 1526 additions and 1283 deletions
|
|
@ -25,20 +25,74 @@ use WebGUI::Operation::Auth;
|
|||
# Init
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Test package for method dispatch
|
||||
BEGIN { $INC{'WebGUI/Auth/TestAuth.pm'} = __FILE__; }
|
||||
|
||||
package WebGUI::Auth::TestAuth;
|
||||
|
||||
use base 'WebGUI::Auth';
|
||||
|
||||
sub new {
|
||||
my $self = shift->SUPER::new(@_);
|
||||
$self->setCallable( ['callable'] );
|
||||
return bless $self, 'WebGUI::Auth::TestAuth'; # Auth requires rebless
|
||||
}
|
||||
|
||||
sub callable {
|
||||
return "callable";
|
||||
}
|
||||
|
||||
sub not_callable {
|
||||
return "not callable";
|
||||
}
|
||||
|
||||
sub www_verify {
|
||||
return "verify";
|
||||
}
|
||||
|
||||
package main;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Tests
|
||||
|
||||
plan tests => 4; # Increment this number for each test you create
|
||||
plan tests => 10; # Increment this number for each test you create
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Test the getInstance method
|
||||
# By default, it returns a WebGUI::Auth::WebGUI object
|
||||
my $auth = WebGUI::Operation::Auth::getInstance( $session );
|
||||
ok($auth, 'getInstance returned something');
|
||||
isa_ok($auth, 'WebGUI::Auth::WebGUI');
|
||||
isa_ok($auth, 'WebGUI::Auth::' . $session->setting->get('authMethod') );
|
||||
|
||||
# Test setting authType by form var
|
||||
$session->request->setup_body({
|
||||
authType => 'TestAuth',
|
||||
});
|
||||
isa_ok(
|
||||
WebGUI::Operation::Auth::getInstance( $session ),
|
||||
'WebGUI::Auth::' . $session->setting->get('authMethod'),
|
||||
'AuthType not in config file, so return default authType',
|
||||
);
|
||||
|
||||
$session->config->addToArray( 'authMethods', 'TestAuth' );
|
||||
isa_ok(
|
||||
WebGUI::Operation::Auth::getInstance( $session ),
|
||||
'WebGUI::Auth::TestAuth',
|
||||
'AuthType in config file, so return instance of authType',
|
||||
);
|
||||
|
||||
$session->user({ userId => 3 });
|
||||
isa_ok(
|
||||
WebGUI::Operation::Auth::getInstance( $session ),
|
||||
'WebGUI::Auth::WebGUI',
|
||||
'AuthType is defined by the logged-in user',
|
||||
);
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Test the web method for auth operation
|
||||
# First a clean session, without an authenticated user
|
||||
$session->user({ userId => 1 });
|
||||
my $output = WebGUI::Operation::Auth::www_auth($session);
|
||||
like(
|
||||
$output,
|
||||
|
|
@ -54,3 +108,33 @@ unlike(
|
|||
qr/<input type="hidden" name="method" value="login" /,
|
||||
"Hidden form elements for login NOT displayed to valid user",
|
||||
);
|
||||
|
||||
# Go back to visitor and test callable dispatch
|
||||
$session->user({ userId => 1 });
|
||||
$session->request->setup_body({
|
||||
authType => 'TestAuth',
|
||||
method => 'callable',
|
||||
});
|
||||
eval { $output = WebGUI::Operation::Auth::www_auth( $session ); };
|
||||
like( $output, qr{\bcallable\b}, 'Callable method is callable' );
|
||||
|
||||
# Test a method not in callable
|
||||
$session->user({ userId => 1 });
|
||||
$session->request->setup_body({
|
||||
authType => 'TestAuth',
|
||||
method => 'not_callable',
|
||||
});
|
||||
my $i18n = WebGUI::International->new($session);
|
||||
my $error = $i18n->get(1077);
|
||||
eval { $output = WebGUI::Operation::Auth::www_auth( $session ); };
|
||||
like( $output, qr{$error}, 'not_callable method gives error message' );
|
||||
|
||||
# Test www_ dispatch
|
||||
$session->user({ userId => 1 });
|
||||
$session->request->setup_body({
|
||||
authType => 'TestAuth',
|
||||
method => 'verify',
|
||||
});
|
||||
eval { $output = WebGUI::Operation::Auth::www_auth( $session ); };
|
||||
like( $output, qr{verify}, 'www_ callable without being setCallable' );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue