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

Merge branch 'WebGUI8' into psgi

Browse source
This commit is contained in:
Graham Knop 2010-05-10 17:03:17 -05:00
commit 65dfb6e683
36 changed files with 378 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

13
t/Session/Style.t
View file

@ -328,14 +328,14 @@ TODO: {
####################################################
#
# process
# no duped headBlockContent
# no duped extraHeadTagsContent
#
####################################################
$style->useEmptyStyle(1);
$style->sent(0);
$session->scratch->set('personalStyleId', $templates->{headBlock}->getId);
$session->scratch->set('personalStyleId', $templates->{extraHeadTags}->getId);
$styled = $style->process('body.content', 'notATemplateId');
@ -369,7 +369,8 @@ $expectedMetas = [
'content' => 'must-revalidate'
},
];
cmp_bag(\@metas, $expectedMetas, 'process, headBlock:no duped headBlock from style template');
cmp_bag(\@metas, $expectedMetas, 'process, extraHeadTags:no duped extraHeadTags from style template');
####################################################
#
# process
@ -480,16 +481,16 @@ sub setup_assets {
};
$templates->{personal} = $importNode->addChild($properties, $properties->{id});
$properties = {
title => 'personal style test template with headBlock',
title => 'personal style test template with extraHeadTags',
className => 'WebGUI::Asset::Template',
url => 'headblock_style',
namespace => 'Style',
template => 'HEADBLOCK STYLE TEMPLATE\n\nBODY=<tmpl_var body.content>\n\nHEAD=<tmpl_var head.tags>',
headBlock => q|<meta name="keywords" content="keyword1,keyword2" />|,
extraHeadTags => q|<meta name="keywords" content="keyword1,keyword2" />|,
id => 'testTemplate_headblock',
# '1234567890123456789012'
};
$templates->{headBlock} = $importNode->addChild($properties, $properties->{id});
$templates->{extraHeadTags} = $importNode->addChild($properties, $properties->{id});
$properties = {
title => 'personal style test template for printing',
className => 'WebGUI::Asset::Template',

6
t/Session/Url.t
View file

@ -417,21 +417,21 @@ my $statefulAsset = WebGUI::Asset->getRoot($session)->addChild({ className => 'W
$versionTag->commit;
$session->asset( $statefulAsset );
$statefulAsset->{_properties}{state} = 'published';
$statefulAsset->state('published');
is(
$session->url->getBackToSiteURL,
WebGUI::Asset->getRoot($session)->getUrl,
q!getBackToSiteURL: When asset state is published, it returns you to the Assets container!
);
$statefulAsset->{_properties}{state} = 'trash';
$statefulAsset->state( 'trash');
is(
$session->url->getBackToSiteURL,
$defaultAssetUrl,
q!getBackToSiteURL: When asset state is trash, it returns you to the default Asset!
);
$statefulAsset->{_properties}{state} = 'clipboard';
$statefulAsset->state('clipboard');
is(
$session->url->getBackToSiteURL,
$defaultAssetUrl,

10
t/Session/Var.t
View file

@ -138,13 +138,13 @@ $session->db->write("update userSession set expires=? where sessionId=?",
my %copyOfVar2 = %{$var2->{_var}};
$copyOfVar2{expires} = $var2->get('lastPageView')-1;
$copyOfVar2{userId} = 3;
$session->cache->set(['session',$var2->getId], \%copyOfVar2);
$session->cache->set($var2->getId, \%copyOfVar2);
my $var3 = WebGUI::Session::Var->new($session, $var2->getId);
is($var3->getId, $var2->getId, 'new Var object has correct id');
isnt($var3->isAdminOn, $var2->isAdminOn, 'new adminOn not equal to old adminOn');
is($var3->isAdminOn, 0, 'new Var object has default adminOn');
isnt($var3->get('userId'), 3, 'new userId not equal to old userId');
is $var3->getId, $var2->getId, 'new Var object has correct id';
isnt $var3->isAdminOn, $var2->isAdminOn, 'new adminOn not equal to old adminOn';
is $var3->isAdminOn, 0, 'new Var object has default adminOn';
isnt $var3->get('userId'), 3, 'new userId not equal to old userId';
$var2->end;
$var3->end;