added #11968: use the language override in the registration form

This commit is contained in:
Jukka Raimovaara 2010-11-17 21:00:50 +02:00
parent 63217ab198
commit b24db340e8
6 changed files with 36 additions and 3 deletions

View file

@ -33,7 +33,7 @@ my ($request, $oldRequest, $output);
#----------------------------------------------------------------------------
# Tests
plan tests => 3; # Increment this number for each test you create
plan tests => 4; # Increment this number for each test you create
#----------------------------------------------------------------------------
# Test createAccountSave and returnUrl together
@ -47,7 +47,9 @@ $session->{_request} = $request;
$auth = WebGUI::Auth->new( $session, $AUTH_METHOD );
my $username = $session->id->generate;
my $language = "German";
push @cleanupUsernames, $username;
$session->scratch->setLanguageOverride($language);
$output = $auth->createAccountSave( $username, { }, "PASSWORD" );
WebGUI::Test->addToCleanup(sub {
for my $username ( @cleanupUsernames ) {
@ -74,6 +76,8 @@ is(
"returnUrl field is used to set redirect after createAccountSave",
);
is $session->user->profileField('language'), $language, 'languageOverride is taken in to account in createAccountSave';
# Session Cleanup
$session->{_request} = $oldRequest;
@ -99,6 +103,7 @@ is(
);
is $output, undef, 'login returns undef when showMessageOnLogin is false';
# Session Cleanup
$session->{_request} = $oldRequest;

View file

@ -33,7 +33,7 @@ WebGUI::Test->addToCleanup($newUser);
#----------------------------------------------------------------------------
# Tests
plan tests => 50; # Increment this number for each test you create
plan tests => 56; # Increment this number for each test you create
#----------------------------------------------------------------------------
# Test the creation of ProfileField
@ -51,6 +51,11 @@ my $uilevelField;
ok( $uilevelField = WebGUI::ProfileField->new( $session, 'uiLevel' ), 'field "uiLevel instantiated' );
isa_ok( $uilevelField, 'WebGUI::ProfileField' );
my $langField;
ok( $langField = WebGUI::ProfileField->new( $session, 'language' ), 'field "language instantiated' );
isa_ok( $langField, 'WebGUI::ProfileField' );
#----------------------------------------------------------------------------
# Test the formField method
@ -79,6 +84,20 @@ ok( $ff = $uilevelField->formField(undef, undef, $newUser), 'formField method re
$ffvalue = $newUser->profileField('uiLevel');
like( $ff, qr/$ffvalue/, 'html returned contains value, uiLevel field, defaulted user' );
$ff = undef;
$ffvalue = undef;
ok( $ff = $langField->formField, 'formField method returns something, language field, session user' );
$ffvalue = $session->user->profileField('language');
like( $ff, qr/value="$ffvalue"[^>]+selected/, 'html returned contains value, language field, session user' );
$ff = undef;
$ffvalue = "German";
$session->scratch->setLanguageOverride($ffvalue);
ok( $ff = $langField->formField, 'formField method returns something, language field, session user, languageOverride' );
like( $ff, qr/value="$ffvalue"[^>]+selected/, 'html returned contains value, language field, session user, languageOverride' );
###########################################################
#
# create