From 4e0e62b2022cee1a1b39a790e88bb54db5076793 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 22 Dec 2010 14:10:58 -0800 Subject: [PATCH] Fix tests that were broken due to the language override merge. --- t/Auth.t | 23 ++++++++++++++++++++++- t/ProfileField.t | 27 ++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/t/Auth.t b/t/Auth.t index 35aa8db63..32b9ef6fe 100644 --- a/t/Auth.t +++ b/t/Auth.t @@ -47,8 +47,15 @@ $session->{_request} = $request; $auth = WebGUI::Auth->new( $session, $AUTH_METHOD ); my $username = $session->id->generate; -my $language = "German"; +my $language = "PigLatin"; push @cleanupUsernames, $username; +installPigLatin(); +WebGUI::Test->addToCleanup(sub { + unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/); + unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/); + rmdir File::Spec->catdir(WebGUI::Test->lib, qw/WebGUI i18n PigLatin/); +}); + $session->scratch->setLanguageOverride($language); $output = $auth->createAccountSave( $username, { }, "PASSWORD" ); WebGUI::Test->addToCleanup(sub { @@ -77,6 +84,7 @@ is( ); is $session->user->profileField('language'), $language, 'languageOverride is taken in to account in createAccountSave'; +$session->scratch->delete('language'); ##Remove language override # Session Cleanup $session->{_request} = $oldRequest; @@ -106,4 +114,17 @@ is $output, undef, 'login returns undef when showMessageOnLogin is false'; # Session Cleanup $session->{_request} = $oldRequest; +sub installPigLatin { + use File::Copy; + mkdir File::Spec->catdir(WebGUI::Test->lib, 'WebGUI', 'i18n', 'PigLatin'); + copy( + WebGUI::Test->getTestCollateralPath('WebGUI.pm'), + File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/) + ); + copy( + WebGUI::Test->getTestCollateralPath('PigLatin.pm'), + File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/) + ); +} + diff --git a/t/ProfileField.t b/t/ProfileField.t index 5a35f24ae..82d530d19 100644 --- a/t/ProfileField.t +++ b/t/ProfileField.t @@ -18,6 +18,7 @@ use strict; use lib "$FindBin::Bin/lib"; use Test::More; use Data::Dumper; +use File::Spec; use WebGUI::Test; # Must use this before any other WebGUI modules use WebGUI::Session; use WebGUI::Form::Text; @@ -92,11 +93,19 @@ ok( $ff = $langField->formField, 'formField method returns something, langua $ffvalue = $session->user->profileField('language'); like( $ff, qr/value="$ffvalue"[^>]+selected/, 'html returned contains value, language field, session user' ); +installPigLatin(); +WebGUI::Test->addToCleanup(sub { + unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/); + unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/); + rmdir File::Spec->catdir(WebGUI::Test->lib, qw/WebGUI i18n PigLatin/); +}); + $ff = undef; -$ffvalue = "German"; +$ffvalue = "PigLatin"; $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' ); +$session->scratch->delete('language'); ########################################################### # @@ -204,3 +213,19 @@ $newProfileField3->set({ required => 1}); is ($newProfileField3->get('required'), 1, 'set required = 1'); is ($newProfileField3->get('editable'), 1, '... editable = 1'); $newProfileField3->delete; + + +sub installPigLatin { + use File::Copy; + mkdir File::Spec->catdir(WebGUI::Test->lib, 'WebGUI', 'i18n', 'PigLatin'); + copy( + WebGUI::Test->getTestCollateralPath('WebGUI.pm'), + File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/) + ); + copy( + WebGUI::Test->getTestCollateralPath('PigLatin.pm'), + File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/) + ); +} + +