oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor Session/Icon to remove a bunch of copy/paste code. Update test to remove deprecated profileField calls.

Browse source
This commit is contained in:
Colin Kuskie 2011-12-28 11:11:21 -08:00
parent a20dd83ae0
commit b8e088ff7a
2 changed files with 54 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

17
t/Session/Icon.t
View file

@ -18,14 +18,8 @@ use Test::Deep;
use Test::MockObject;
use HTML::TokeParser;
my $numTests = 10;
my @iconTests = fetchTestSet();
$numTests += scalar(@iconTests) * 4;
plan tests => $numTests;
my $session = WebGUI::Test->session;
####################################################
@ -36,8 +30,8 @@ my $session = WebGUI::Test->session;
#
####################################################
my $origToolbar = $session->user->profileField('toolbar');
WebGUI::Test->addToCleanup(sub { $session->user->profileField('toolbar', $origToolbar); },);
my $origToolbar = $session->user->get('toolbar');
WebGUI::Test->addToCleanup(sub { $session->user->update('toolbar', $origToolbar); },);
my $toolbars = $session->url->extras('toolbar/');
my $request = $session->request;
@ -52,13 +46,13 @@ my $i18n = WebGUI::International->new($session, 'Icon');
#
####################################################
$session->user->profileField('toolbar', 'useLanguageDefault');
$session->user->update('toolbar', 'useLanguageDefault');
is($session->icon->getBaseURL, $toolbars.'bullet/', 'getBaseUrl: default English toolbar is bullet');
$session->user->profileField('toolbar', 'mullet');
$session->user->update('toolbar', 'mullet');
is($session->icon->getBaseURL, $toolbars.'mullet/', 'getBaseUrl: fetch user preference of mullet toolbar');
$session->user->profileField('toolbar', $origToolbar);
$session->user->update('toolbar', $origToolbar);
####################################################
#
@ -154,6 +148,7 @@ SKIP: {
cmp_bag(\@toolbarDirs, \@toolbarOptionDirs, 'getToolbarOptions');
}
done_testing;
sub linkAndText {
my ($text, $tag, @params) = @_;