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

almost done fixing addRevision tests

Browse source
This commit is contained in:
Doug Bell 2010-11-19 19:26:39 -06:00
parent 6931fd471e
commit 7c14d1e6c4
122 changed files with 389 additions and 1052 deletions
Download patch file Download diff file Expand all files Collapse all files

5
t/Asset/Wobject/Article.t
View file

@ -21,7 +21,7 @@ use WebGUI::Asset::Wobject::Article;
my $session = WebGUI::Test->session;
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
# Lets create an article wobject using all defaults then test to see if those defaults were set
#
@ -36,9 +36,6 @@ my $node = WebGUI::Asset->getImportNode($session);
# storageId => undef,
#};
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Article Test"});
WebGUI::Test->addToCleanup($versionTag);
my $article = $node->addChild({className=>'WebGUI::Asset::Wobject::Article'});
# Test for a sane object type

91
t/Asset/Wobject/Calendar.t
View file

@ -60,18 +60,13 @@ plan tests => 12 + scalar @icalWrapTests;
my $session = WebGUI::Test->session;
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Calendar Test"});
addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $cal = $node->addChild({className=>'WebGUI::Asset::Wobject::Calendar'});
my $windowCal = $node->addChild({
className => 'WebGUI::Asset::Wobject::Calendar',
title => 'Calendar for doing event window testing',
});
$versionTag->commit();
# Test for a sane object type
isa_ok($cal, 'WebGUI::Asset::Wobject::Calendar');
@ -125,13 +120,17 @@ my $windowStart = $startDt->clone;
my $endDt = $startDt->clone->add(days => 2);
my $windowEnd = $endDt->clone->subtract(seconds => 1);
my $tag2 = WebGUI::VersionTag->getWorking($session);
my %tag = ( tagId => $tag2->getId, status => "pending" );
my $inside = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
title => 'Inside window, no times, same day',
startDate => $bday->toDatabaseDate,
endDate => $bday->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $insidewt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -141,7 +140,8 @@ my $insidewt = $windowCal->addChild({
startTime => $bday->toDatabaseTime,
endTime => $bday->clone->add(hours => 1)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $outsideHigh = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -149,7 +149,8 @@ my $outsideHigh = $windowCal->addChild({
startDate => $endDt->clone->add(days => 2)->toDatabaseDate,
endDate => $endDt->clone->add(days => 3)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $outsideLow = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -157,7 +158,8 @@ my $outsideLow = $windowCal->addChild({
startDate => $startDt->clone->subtract(days => 3)->toDatabaseDate,
endDate => $startDt->clone->subtract(days => 2)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $straddle = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -165,7 +167,8 @@ my $straddle = $windowCal->addChild({
startDate => $startDt->clone->subtract(days => 1)->toDatabaseDate,
endDate => $endDt->clone->add(days => 1)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $straddlewt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -175,7 +178,8 @@ my $straddlewt = $windowCal->addChild({
startTime => $startDt->clone->subtract(hours => 12)->toDatabaseTime,
endTime => $endDt->clone->add(hours => 12)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $straddleLowwt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -185,7 +189,8 @@ my $straddleLowwt = $windowCal->addChild({
startTime => $startDt->clone->subtract(hours => 12)->toDatabaseTime,
endTime => $startDt->clone->add(hours => 12)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $straddleHighwt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -195,7 +200,8 @@ my $straddleHighwt = $windowCal->addChild({
startTime => $endDt->clone->subtract(hours => 12)->toDatabaseTime,
endTime => $endDt->clone->add(hours => 12)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $justBeforewt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -205,7 +211,8 @@ my $justBeforewt = $windowCal->addChild({
startTime => $startDt->clone->subtract(hours => 1)->toDatabaseTime,
endTime => $startDt->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $justAfterwt = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -215,7 +222,8 @@ my $justAfterwt = $windowCal->addChild({
startTime => $endDt->toDatabaseTime,
endTime => $endDt->clone->add(hours => 1)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
}, );
my $justBefore = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -223,7 +231,8 @@ my $justBefore = $windowCal->addChild({
startDate => $startDt->clone->add(days => -1)->toDatabaseDate,
endDate => $startDt->clone->add(days => -1)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $justAfter = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -231,7 +240,8 @@ my $justAfter = $windowCal->addChild({
startDate => $endDt->clone->add(days => 1)->toDatabaseDate,
endDate => $endDt->clone->add(days => 1)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $starting = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -239,7 +249,8 @@ my $starting = $windowCal->addChild({
startDate => $startDt->toDatabaseDate,
endDate => $startDt->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
}, );
my $ending = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -247,7 +258,8 @@ my $ending = $windowCal->addChild({
startDate => $endDt->clone->add(days => -1)->toDatabaseDate,
endDate => $endDt->clone->add(days => -1)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $coincident = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -255,7 +267,8 @@ my $coincident = $windowCal->addChild({
startDate => $startDt->toDatabaseDate,
endDate => $endDt->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $coincidentLow = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -263,7 +276,8 @@ my $coincidentLow = $windowCal->addChild({
startDate => $startDt->toDatabaseDate,
endDate => $endDt->clone->add(days => 1)->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
my $coincidentHigh = $windowCal->addChild({
className => 'WebGUI::Asset::Event',
@ -271,7 +285,8 @@ my $coincidentHigh = $windowCal->addChild({
startDate => $startDt->clone->add( days => -1, )->toDatabaseDate,
endDate => $endDt->toDatabaseDate,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
%tag,
},);
# no suffix = all day event
# wt suffix = with times
@ -294,7 +309,6 @@ my $coincidentHigh = $windowCal->addChild({
#
# Everything above the window should be included in the set of events returned.
my $tag2 = WebGUI::VersionTag->getWorking($session);
$tag2->commit;
addToCleanup($tag2);
@ -338,7 +352,7 @@ my $allDay = $weekCal->addChild({
startTime => $allDayDt->clone->truncate(to => 'day')->toDatabaseTime,
endTime => $allDayDt->clone->add(days => 1)->truncate(to => 'day')->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
}, );
my $endOfWeek = $weekCal->addChild({
className => 'WebGUI::Asset::Event',
@ -348,11 +362,7 @@ my $endOfWeek = $weekCal->addChild({
startTime => $nextWeekDt->toDatabaseTime,
endTime => $nextWeekDt->clone->add(hours => 1)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
my $tag3 = WebGUI::VersionTag->getWorking($session);
$tag3->commit;
addToCleanup($tag3);
}, );
my $weekVars = $weekCal->viewWeek({ start => $bday });
my @eventBins = ();
@ -418,7 +428,7 @@ $allDay = $monthCal->addChild({
startTime => $allDayDt->clone->truncate(to => 'day')->toDatabaseTime,
endTime => $allDayDt->clone->add(days => 1)->truncate(to => 'day')->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
},);
my $endOfMonth = $monthCal->addChild({
className => 'WebGUI::Asset::Event',
@ -428,11 +438,7 @@ my $endOfMonth = $monthCal->addChild({
startTime => $nextMonthDt->toDatabaseTime,
endTime => $nextMonthDt->clone->add(hours => 1)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
my $tag4 = WebGUI::VersionTag->getWorking($session);
$tag4->commit;
addToCleanup($tag4);
}, );
my $monthVars = $monthCal->viewMonth({ start => $bday });
@eventBins = ();
@ -489,7 +495,7 @@ $allDay = $dayCal->addChild({
startTime => $allDayDt->clone->truncate(to => 'day')->toDatabaseTime,
endTime => $allDayDt->clone->add(days => 1)->truncate(to => 'day')->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
}, );
my $nextDay = $dayCal->addChild({
className => 'WebGUI::Asset::Event',
@ -499,11 +505,7 @@ my $nextDay = $dayCal->addChild({
startTime => $nextDayDt->toDatabaseTime,
endTime => $nextDayDt->clone->add(hours => 1)->toDatabaseTime,
timeZone => $tz,
}, undef, undef, {skipAutoCommitWorkflows => 1});
my $tag5 = WebGUI::VersionTag->getWorking($session);
$tag5->commit;
addToCleanup($tag5);
},);
my $hourVars = $dayCal->viewDay({ start => $nextDayDt });
@eventBins = ();
@ -583,11 +585,6 @@ my $feedCal = $node->addChild({
title => 'Calendar for doing feed tests',
});
my $feedTag = WebGUI::VersionTag->getWorking($session);
$feedTag->set({name=>"Calendar Feed Test"});
addToCleanup($feedTag);
$feedTag->commit;
cmp_deeply(
$feedCal->getFeeds(),
[],

6
t/Asset/Wobject/Carousel.t
View file

@ -20,11 +20,7 @@ use WebGUI::Asset::Wobject::Carousel;
my $session = WebGUI::Test->session;
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Search Test"});
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $carousel = $node->addChild({className=>'WebGUI::Asset::Wobject::Carousel'});
# Test for a sane object type

5
t/Asset/Wobject/Collaboration.t
View file

@ -28,7 +28,7 @@ my @addChildCoda = (undef, undef,
);
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
# grab a named version tag
my $versionTag = WebGUI::VersionTag->getWorking($session);
@ -72,6 +72,7 @@ my $props = {
tagId => $tag1->getId,
};
my $thread = $collab->addChild($props, @addChildCoda);
$thread->setSkipNotification;
$tag1->commit;
addToCleanup($tag1);
@ -86,6 +87,7 @@ $props = {
tagId => $tag2->getId,
};
my $thread2 = $collab->addChild($props, @addChildCoda);
$thread2->setSkipNotification;
$tag2->commit;
addToCleanup($tag2);
@ -115,6 +117,7 @@ my $thread3 = $collab->addChild({
className => 'WebGUI::Asset::Post::Thread',
content => "Again!",
}, @addChildCoda);
$thread->setSkipNotification;
$thread3->commit;
$collab = $collab->cloneFromDb;
is $collab->get('threads'), 2, '... added 1 thread';

14
t/Asset/Wobject/Collaboration/getThreads.t
View file

@ -22,10 +22,7 @@ use WebGUI::Session;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
WebGUI::Test->addToCleanup($versionTags[-1]);
my @addChildArgs = ( {skipAutoCommitWorkflows=>1} );
my $collab = WebGUI::Asset->getImportNode( $session )->addChild({
my $collab = WebGUI::Test->asset->addChild({
className => 'WebGUI::Asset::Wobject::Collaboration',
threadsPerPage => 20,
});
@ -36,29 +33,28 @@ my @threads = (
title => "X - Foo",
isSticky => 0,
threadRating => 4,
}, undef, 1, @addChildArgs),
}, undef, 1, ),
$collab->addChild( {
className => 'WebGUI::Asset::Post::Thread',
title => "W - Bar",
isSticky => 0,
threadRating => 2,
}, undef, 2, @addChildArgs),
}, undef, 2, ),
$collab->addChild( {
className => 'WebGUI::Asset::Post::Thread',
title => "Z - Baz",
isSticky => 1,
threadRating => 6,
}, undef, 3, @addChildArgs),
}, undef, 3, ),
$collab->addChild( {
className => 'WebGUI::Asset::Post::Thread',
title => "Y - Shank",
isSticky => 1,
threadRating => 5,
}, undef, 4, @addChildArgs),
}, undef, 4, ),
);
$_->setSkipNotification for @threads; # 100+ messages later...
$versionTags[-1]->commit;
#----------------------------------------------------------------------------
# Tests

15
t/Asset/Wobject/Collaboration/permission.t
View file

@ -24,19 +24,13 @@ use WebGUI::Test::Maker::Permission;
my $session = WebGUI::Test->session;
$session->user( { userId => 3 } );
my $maker = WebGUI::Test::Maker::Permission->new;
my $node = WebGUI::Asset->getImportNode( $session );
my $node = WebGUI::Test->asset;
my %user;
$user{"2"} = WebGUI::User->new( $session, "new" );
$user{"2"}->addToGroups( ['2'] ); # Registered user
WebGUI::Test->addToCleanup($user{'2'});
my $versionTag = WebGUI::VersionTag->getWorking( $session );
$versionTag->set( { name => "Collaboration Test" } );
WebGUI::Test->addToCleanup($versionTag);
my @addArgs = ( undef, undef, { skipAutoCommitWorkflows => 1 } );
my $collab
= $node->addChild({
className => "WebGUI::Asset::Wobject::Collaboration",
@ -45,12 +39,7 @@ my $collab
ownerUserId => 3, # Admin
postGroupId => 2, # Registered Users
canStartThreadGroupId => 3, # Admin
}, @addArgs );
$versionTag->commit( { timeout => 1_000_000 } );
# Re-load the collab to get the newly committed properties
$collab = WebGUI::Asset->newById( $session, $collab->getId );
},);
#----------------------------------------------------------------------------
# Tests

23
t/Asset/Wobject/Collaboration/templateVariables.t
View file

@ -27,8 +27,7 @@ plan tests => 23; # Increment this number for each test you create
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my @addChildArgs = ( {skipAutoCommitWorkflows=>1, skipNotification => 1, } );
my $collab = WebGUI::Asset->getImportNode( $session )->addChild({
my $collab = WebGUI::Test->asset->addChild({
className => 'WebGUI::Asset::Wobject::Collaboration',
threadsPerPage => 20,
displayLastReply => 1,
@ -40,19 +39,19 @@ my @threads = (
title => "X - Foo",
isSticky => 0,
ownerUserId => 1,
}, undef, 1, @addChildArgs),
}, undef, 1,),
$collab->addChild( {
className => 'WebGUI::Asset::Post::Thread',
title => "X - Bar",
isSticky => 0,
ownerUserId => 3,
}, undef, 2, @addChildArgs),
}, undef, 2,),
);
$_->setSkipNotification for @threads; # 100+ messages later...
my $versionTag = WebGUI::VersionTag->getWorking( $session );
$versionTag->commit;
addToCleanup($versionTag);
for my $t ( @threads ) {
$t->setSkipNotification;
$t->commit;
}
my $templateVars;
my $posts;
@ -98,18 +97,20 @@ is( $posts->[0]->{'url'}, $threads[1]->getUrl.'#id'.$threads[1]->getId, 'url ha
###################################################################
my @newThreads = ();
my $vt2 = WebGUI::VersionTag->getWorking($session);
foreach my $index (1 .. 5) {
$newThreads[$index] = $collab->addChild( {
className => 'WebGUI::Asset::Post::Thread',
title => "X - Bar",
isSticky => 0,
ownerUserId => 3,
}, undef, 2+$index, @addChildArgs);
tagId => $vt2->getId,
status => "pending",
}, undef, 2+$index);
$newThreads[$index]->setSkipNotification;
}
my $vt2 = WebGUI::VersionTag->getWorking($session);
$vt2->commit;
addToCleanup($versionTag);
addToCleanup($vt2);
$session->user({userId => 3});
$templateVars = $collab->getViewTemplateVars();

5
t/Asset/Wobject/Collaboration/unarchiveAll.t
View file

@ -38,7 +38,10 @@ my @threads = (
groupIdEdit => '3',
}),
);
$_->commit for @threads;
for my $t ( @threads ) {
$t->setSkipNotification;
$t->commit;
}
WebGUI::Test->addToCleanup($collab,@threads);

14
t/Asset/Wobject/DataForm.t
View file

@ -27,23 +27,19 @@ use WebGUI::Session;
my $session = WebGUI::Test->session;
# Create a DataForm
my $df = WebGUI::Asset->getImportNode( $session )
my $df = WebGUI::Test->asset
->addChild( {
className => "WebGUI::Asset::Wobject::DataForm",
mailData => 0,
fieldConfiguration => '[]',
} );
}, undef, time-10 );
my $dform = WebGUI::Asset->getDefault($session)->addChild({
my $dform = WebGUI::Test->asset->addChild({
className => "WebGUI::Asset::Wobject::DataForm",
mailData => 0,
});
}, undef, time-5);
$dform->createField('gotCaptcha', { type => 'Captcha', name => 'humanCheck', });
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->commit;
#----------------------------------------------------------------------------
# Tests
@ -69,7 +65,7 @@ WebGUI::Test->interceptLogging( sub {
#----------------------------------------------------------------------------
# getContentLastModified
sleep 3;
sleep 3; # whyyyyyyyy
$df->{_mode} = 'form';
is($df->getContentLastModified, $df->get('lastModified'), 'getContentLastModified: form normally returns lastModified');

4
t/Asset/Wobject/DataForm/addEntry.t
View file

@ -23,12 +23,10 @@ use WebGUI::Session;
# Init
my $session = WebGUI::Test->session;
my $df = WebGUI::Asset->getImportNode($session)->addChild( {
my $df = WebGUI::Test->asset->addChild( {
className => 'WebGUI::Asset::Wobject::DataForm',
} );
WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
# Add fields to the dataform
$df->createField( "name", { type => "text", } );
$df->createField( "message", { type => "text", } );

8
t/Asset/Wobject/DataForm/viewForm.t
View file

@ -25,7 +25,7 @@ use WebGUI::Session;
# Init
my $session = WebGUI::Test->session;
my $df = WebGUI::Asset->getImportNode($session)->addChild( {
my $df = WebGUI::Test->asset->addChild( {
className => 'WebGUI::Asset::Wobject::DataForm',
defaultview => 0,
templateId => 'PBtmpl0000000000000141',
@ -35,12 +35,6 @@ my $df = WebGUI::Asset->getImportNode($session)->addChild( {
$df->createField( "bigName", { type => "textarea", isHidden => 0, } );
$df->createField( "messageCount", { type => "integer", isHidden => 0, } );
my $tag = WebGUI::VersionTag->getWorking( $session );
WebGUI::Test->addToCleanup( $tag );
$tag->commit;
$df = $df->cloneFromDb;
#----------------------------------------------------------------------------
# Tests

4
t/Asset/Wobject/DataForm/viewList.t
View file

@ -23,12 +23,10 @@ use WebGUI::Session;
# Init
my $session = WebGUI::Test->session;
my $df = WebGUI::Asset->getImportNode($session)->addChild( {
my $df = WebGUI::Test->asset->addChild( {
className => 'WebGUI::Asset::Wobject::DataForm',
} );
WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
# Add fields to the dataform
$df->createField( "name", { type => "text", } );
$df->createField( "message", { type => "text", } );

2
t/Asset/Wobject/EventManagementSystem.t
View file

@ -39,7 +39,7 @@ $registrars->addUsers([$registrar->getId]);
$attendees->addUsers([$attender->getId]);
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
# Create a version tag to work in
my $versionTag = WebGUI::VersionTag->getWorking($session);

5
t/Asset/Wobject/Gallery/permission.t
View file

@ -20,10 +20,7 @@ use Test::More;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Gallery Test"});
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $maker = WebGUI::Test::Maker::Permission->new;
my $gallery;

13
t/Asset/Wobject/GalleryAlbum/00base.t
View file

@ -20,10 +20,7 @@ use Test::More;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"});
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
@ -42,16 +39,8 @@ use_ok("WebGUI::Asset::Wobject::GalleryAlbum");
my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
$versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
is(
Scalar::Util::blessed($album), "WebGUI::Asset::Wobject::GalleryAlbum",
"Album is a WebGUI::Asset::Wobject::GalleryAlbum object",

25
t/Asset/Wobject/GalleryAlbum/ajax.t
View file

@ -21,9 +21,7 @@ use WebGUI::Asset::Wobject::GalleryAlbum;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my %user;
$user{'1'} = WebGUI::User->new( $session, "new" );
@ -35,27 +33,15 @@ WebGUI::Test->addToCleanup($user{'2'});
# Create everything as user no. 1
$session->user({ user => $user{'1'} });
$versionTag->set({name=>"Album Test"});
# Create gallery and a single album
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
groupIdEdit => 3, # Admins
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
# Create 5 photos inside the gallery
@ -66,19 +52,10 @@ for (my $i = 0; $i < 5; $i++)
my $photo
= $album->addChild({
className => "WebGUI::Asset::File::GalleryFile::Photo",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
$photoId[$i] = $photo->getId;
}
# Commit all changes
$versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
# Make album default asset
$session->asset( $album );

16
t/Asset/Wobject/GalleryAlbum/delete.t
View file

@ -23,10 +23,7 @@ use Test::More;
my $maker = WebGUI::Test::Maker::HTML->new;
my $session = WebGUI::Test->session;
$session->user({ userId => 3 });
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"});
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
@ -40,19 +37,8 @@ my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
ownerUserId => "3", # Admin
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
$versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
foreach my $asset ($gallery, $album) {
$asset = $asset->cloneFromDb;
}
#----------------------------------------------------------------------------
# Tests
plan tests => 5;

25
t/Asset/Wobject/GalleryAlbum/navigation.t
View file

@ -19,51 +19,28 @@ use Test::More;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->set({name=>"Album Test"});
my $node = WebGUI::Test->asset;
# Create gallery and a single album
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
# Create 5 photos inside the gallery
my @photo;
for (my $i = 0; $i < 5; $i++)
{
$photo[$i]
= $album->addChild({
className => "WebGUI::Asset::File::GalleryFile::Photo",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
}
# Commit all changes
$versionTag->commit;
#----------------------------------------------------------------------------
# Tests
plan tests => 15;

12
t/Asset/Wobject/GalleryAlbum/permission.t
View file

@ -21,16 +21,13 @@ use WebGUI::Test::Maker::Permission;
# Init
my $maker = WebGUI::Test::Maker::Permission->new;
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
my %user;
$user{"2"} = WebGUI::User->new( $session, "new" );
$user{"2"}->addToGroups( ['2'] ); # Registered user
WebGUI::Test->addToCleanup($user{'2'});
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"});
addToCleanup($versionTag);
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
@ -44,15 +41,8 @@ my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
ownerUserId => "3", # Admin
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
$versionTag->commit;
#----------------------------------------------------------------------------
# Tests
plan tests => 36;

17
t/Asset/Wobject/GalleryAlbum/slideshow.t
View file

@ -22,9 +22,7 @@ use WebGUI::Test::Maker::HTML;
# Init
my $maker = WebGUI::Test::Maker::HTML->new;
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Album Test"});
my $node = WebGUI::Test->asset;
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
@ -38,11 +36,6 @@ my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
ownerUserId => "3", # Admin
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
my @photos;
for my $i ( 0 .. 5 ) {
@ -50,17 +43,9 @@ for my $i ( 0 .. 5 ) {
= $album->addChild({
className => "WebGUI::Asset::File::GalleryFile::Photo",
filename => "$i.jpg",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
}
$versionTag->commit;
WebGUI::Test->addToCleanup($versionTag);
#----------------------------------------------------------------------------
# Tests
plan tests => 1;

17
t/Asset/Wobject/GalleryAlbum/thumbnails.t
View file

@ -22,10 +22,7 @@ use WebGUI::Test::Maker::HTML;
# Init
my $maker = WebGUI::Test::Maker::HTML->new;
my $session = WebGUI::Test->session;
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->set({name=>"Album Test"});
my $node = WebGUI::Test->asset;
my $gallery
= $node->addChild({
className => "WebGUI::Asset::Wobject::Gallery",
@ -39,11 +36,6 @@ my $album
= $gallery->addChild({
className => "WebGUI::Asset::Wobject::GalleryAlbum",
ownerUserId => "3", # Admin
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
my @photos;
for my $i ( 0 .. 5 ) {
@ -51,16 +43,9 @@ for my $i ( 0 .. 5 ) {
= $album->addChild({
className => "WebGUI::Asset::File::GalleryFile::Photo",
filename => "$i.jpg",
},
undef,
undef,
{
skipAutoCommitWorkflows => 1,
});
}
$versionTag->commit;
#----------------------------------------------------------------------------
# Tests
plan tests => 1;

6
t/Asset/Wobject/Poll.t
View file

@ -48,7 +48,7 @@ SKIP: {
skip "Unable to load module $class", $tests unless $loaded;
my $defaultNode = WebGUI::Asset->getDefault($session);
my $defaultNode = WebGUI::Test->asset;
my $template = $defaultNode->addChild({
className => 'WebGUI::Asset::Template',
title => 'test poll template',
@ -74,10 +74,6 @@ my $poll = $defaultNode->addChild({
graphConfiguration => '{"graph_labelFontSize":"20","xyGraph_chartWidth":"200","xyGraph_drawRulers":"1","graph_labelColor":"#333333","xyGraph_drawAxis":"1","graph_formNamespace":"Graph_XYGraph_Bar","graph_backgroundColor":"#ffffff","xyGraph_bar_barSpacing":0,"graph_labelFontId":"defaultFont","graph_labelOffset":"10","xyGraph_drawMode":"sideBySide","xyGraph_yGranularity":"10","xyGraph_chartHeight":"200","graph_imageHeight":"300","graph_imageWidth":"300","xyGraph_drawLabels":"1","xyGraph_bar_groupSpacing":0,"graph_paletteId":"defaultPalette"}',
});
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$versionTag->commit;
isa_ok($poll, 'WebGUI::Asset::Wobject::Poll');
$poll->setVote('daily', 1, '127.0.0.1');

6
t/Asset/Wobject/SQLReport.t
View file

@ -35,7 +35,7 @@ plan tests => 4;
#----------------------------------------------------------------------------
# put your tests here
my $defaultNode = WebGUI::Asset->getDefault($session);
my $defaultNode = WebGUI::Test->asset;
my $report = $defaultNode->addChild({
className => 'WebGUI::Asset::Wobject::SQLReport',
@ -44,10 +44,6 @@ my $report = $defaultNode->addChild({
dqQuery1 => 'select * from users',
});
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->commit;
addToCleanup($versionTag);
isa_ok($report, 'WebGUI::Asset::Wobject::SQLReport');
is($report->get('cacheTimeout'), 50, 'cacheTimeout set correctly');

1
t/Asset/Wobject/Search.t
View file

@ -108,6 +108,7 @@ $search->update({
};
my $thread = $collab->addChild($props, @addArgs);
$thread->setSkipNotification;
$versionTag2->commit();
addToCleanup($versionTag2);

16
t/Asset/Wobject/Shelf.t
View file

@ -48,7 +48,7 @@ SKIP: {
skip "Unable to load module $class", $tests unless $loaded;
my $root = WebGUI::Asset->getRoot($session);
my $root = WebGUI::Test->asset;
my $shelf = $root->addChild({className => $class});
#######################################################################
@ -426,7 +426,7 @@ SKIP: {
#
#######################################################################
$shelf2 = WebGUI::Asset->getRoot($session)->addChild({className => $class});
$shelf2 = WebGUI::Test->asset->addChild({className => $class});
$pass = 0;
eval {
@ -442,11 +442,6 @@ SKIP: {
$shelf2->purge;
undef $shelf2;
##Clear out this tag so we can do downstream work.
my $tag = WebGUI::VersionTag->getWorking($session);
$tag->commit;
WebGUI::Test->addToCleanup($tag);
#######################################################################
#
# Template variables
@ -468,9 +463,6 @@ SKIP: {
className => $class,
templateId => $testTemplate->getId,
});
my $tag2 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($tag2);
$tag2->commit;
$session->user({userId => 1});
$testShelf->prepareView;
my $json = $testShelf->view;
@ -483,10 +475,6 @@ SKIP: {
groupIdView => $inGroup->getId,
title => 'Private Product',
});
my $tag3 = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($tag3);
$tag3->commit;
$session->user({user => $tommy});
$testShelf->prepareView;
$json = $testShelf->view;

10
t/Asset/Wobject/StoryArchive.t
View file

@ -71,7 +71,7 @@ my $versionTag;
my $creationDateSth = $session->db->prepare('update asset set creationDate=? where assetId=?');
my @skipAutoCommit = WebGUI::Test->getAssetSkipCoda;
my $home = WebGUI::Asset->getDefault($session);
my $home = WebGUI::Test->asset;
$versionTag = WebGUI::VersionTag->getWorking($session);
my %tag = ( tagId => $versionTag->getId, status => "pending" );
@ -137,11 +137,11 @@ is($todayFolder->get('styleTemplateId'), $archive->get('styleTemplateId'), '...
addToCleanup($arch2);
is $arch2->get('url'),
'home/extension-tester.ext',
$home->get('url').'/extension-tester.ext',
'ext added';
is $arch2->getFolderUrl('blah'),
'home/extension-tester/blah.ext',
$home->get('url').'/extension-tester/blah.ext',
'folder url: strip extension from parent and add to child';
my $folder = $arch2->getFolder($now);
@ -710,10 +710,6 @@ WebGUI::Test->addToCleanup($zzz_child);
$archive->update({storiesPerPage => 25, storySortOrder => 'Alphabetically' });
$tag1 = WebGUI::VersionTag->getWorking($session);
$tag1->commit;
WebGUI::Test->addToCleanup($tag1);
$templateVars = $archive->viewTemplateVariables();
cmp_deeply (

6
t/Asset/Wobject/StoryTopic.t
View file

@ -38,7 +38,7 @@ my $class = 'WebGUI::Asset::Wobject::StoryTopic';
my $versionTag = WebGUI::VersionTag->getWorking($session);
my $archive = WebGUI::Asset->getDefault($session)->addChild({className => 'WebGUI::Asset::Wobject::StoryArchive', title => 'My Stories', url => '/home/mystories'});
my $archive = WebGUI::Test->asset->addChild({className => 'WebGUI::Asset::Wobject::StoryArchive', title => 'My Stories', url => '/home/mystories'});
my $now = time();
my $nowFolder = $archive->getFolder($now);
@ -72,7 +72,7 @@ STORY: foreach my $name (@characters) {
$storyHandler->{bogs}->update({subtitle => 'drinking his food through a straw'});
my $topicTag = WebGUI::VersionTag->getWorking($session);
my $topic = WebGUI::Asset->getDefault($session)->addChild({
my $topic = WebGUI::Test->asset->addChild({
className => 'WebGUI::Asset::Wobject::StoryTopic',
title => 'Popular inmates in Shawshank Prison',
keywords => join(',', @inmates),
@ -364,7 +364,7 @@ cmp_deeply(
# Regression -- Empty StoryTopics shouldn't blow up
################################################################
my $emptyarchive = WebGUI::Asset->getDefault($session)->addChild({
my $emptyarchive = WebGUI::Test->asset->addChild({
className => 'WebGUI::Asset::Wobject::StoryTopic',
title => 'Why Do Good Things Happen To Bad People',
url => '/home/badstories',

6
t/Asset/Wobject/Survey.t
View file

@ -25,14 +25,10 @@ my ($survey);
my $user = WebGUI::User->new( $session, 'new' );
WebGUI::Test->addToCleanup($user);
my $import_node = WebGUI::Asset->getImportNode($session);
my $import_node = WebGUI::Test->asset;
# Create a Survey
$survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
my $tag = WebGUI::VersionTag->getWorking($session);
$tag->commit;
$survey = $survey->cloneFromDb;
WebGUI::Test->addToCleanup($survey);
isa_ok($survey, 'WebGUI::Asset::Wobject::Survey');
my $sJSON = $survey->getSurveyJSON;

5
t/Asset/Wobject/SyndicatedContent.t
View file

@ -30,12 +30,9 @@ my %var;
## SETUP ##
##############################
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
# Create a version tag to work in
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"SyndicatedContent Test"});
addToCleanup($versionTag);
my $syndicated_content = $node->addChild({className=>'WebGUI::Asset::Wobject::SyndicatedContent'});
##############################

5
t/Asset/Wobject/SyndicatedContent/encodings.t
View file

@ -32,12 +32,9 @@ my %var;
##############################
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
# Create a version tag to work in
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"SyndicatedContent Test"});
addToCleanup($versionTag);
my $syndicated_content = $node->addChild({className=>'WebGUI::Asset::Wobject::SyndicatedContent'});
####################################################################

5
t/Asset/Wobject/Thingy.t
View file

@ -24,7 +24,7 @@ use Data::Dumper;
my $session = WebGUI::Test->session;
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $node = WebGUI::Test->asset;
my $templateId = 'THING_EDIT_TEMPLATE___';
my $templateMock = WebGUI::Test::MockAsset->new('WebGUI::Asset::Template');
@ -32,9 +32,6 @@ $templateMock->mock_id($templateId);
my $templateVars;
$templateMock->mock('process', sub { $templateVars = $_[1]; } );
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"Thingy Test"});
WebGUI::Test->addToCleanup($versionTag);
my $thingy = $node->addChild({className=>'WebGUI::Asset::Wobject::Thingy'});
# Test for a sane object type

6
t/Asset/Wobject/UserList.t
View file

@ -21,11 +21,7 @@ use WebGUI::Asset::Wobject::UserList;
my $session = WebGUI::Test->session;
# Do our work in the import node
my $node = WebGUI::Asset->getImportNode($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
$versionTag->set({name=>"UserList Test"});
WebGUI::Test->addToCleanup($versionTag);
my $node = WebGUI::Test->asset;
my $userList = $node->addChild({className=>'WebGUI::Asset::Wobject::UserList'});
# Test for a sane object type

21
t/Asset/Wobject/WikiMaster.t
View file

@ -24,7 +24,7 @@ use WebGUI::Session;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $import = WebGUI::Asset->getImportNode( $session );
my $import = WebGUI::Test->asset;
my @childCoda = (undef, undef, { skipAutoCommitWorkflows => 1, skipNotification => 1, } );
my @revCoda = (undef, { skipAutoCommitWorkflows => 1, skipNotification => 1, } );
@ -37,13 +37,7 @@ my $wiki
title => 'testwiki',
}, @childCoda );
my $wikitag = WebGUI::VersionTag->getWorking( $session );
$wikitag->commit;
WebGUI::Test->addToCleanup($wikitag);
$wiki = $wiki->cloneFromDb;
my %page_set = ();
foreach my $keywords (qw/staff inmates criminals/) {
$page_set{$keywords} = $wiki->addChild({
className => 'WebGUI::Asset::WikiPage',
@ -51,11 +45,6 @@ foreach my $keywords (qw/staff inmates criminals/) {
}, @childCoda);
}
my $tag_set1 = WebGUI::VersionTag->getWorking($session);
$tag_set1->commit;
WebGUI::Test->addToCleanup($tag_set1);
#----------------------------------------------------------------------------
# Tests
@ -149,10 +138,6 @@ foreach my $title (qw/red andy brooks heywood norton hadley/) {
}, @childCoda);
}
my $tag_set2 = WebGUI::VersionTag->getWorking($session);
$tag_set2->commit;
WebGUI::Test->addToCleanup($tag_set2);
cmp_deeply(
$wiki->getKeywordHierarchy(),
[
@ -188,10 +173,6 @@ cmp_deeply(
$wiki->setSubKeywords('andy', 'criminals', 'inmates');
$wiki->setSubKeywords('brooks', 'criminals');
my $tag_set3 = WebGUI::VersionTag->getWorking($session);
$tag_set3->commit;
WebGUI::Test->addToCleanup($tag_set3);
cmp_deeply(
$wiki->getKeywordHierarchy(),
[

4
t/Asset/Wobject/WikiMaster/featured.t
View file

@ -22,7 +22,7 @@ use WebGUI::Session;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $import = WebGUI::Asset->getImportNode( $session );
my $import = WebGUI::Test->asset;
my $wiki
= $import->addChild( {
@ -42,8 +42,6 @@ my $featuredPage
content => 'A how-to book',
}, undef, undef, { skipAutoCommitWorkflows => 1 } );
WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
#----------------------------------------------------------------------------
# Tests

4
t/Asset/Wobject/WikiMaster/subscribable.t
View file

@ -22,7 +22,7 @@ use WebGUI::Group;
#----------------------------------------------------------------------------
# Init
my $session = WebGUI::Test->session;
my $import = WebGUI::Asset->getImportNode( $session );
my $import = WebGUI::Test->asset;
my $wiki
= $import->addChild( {
className => 'WebGUI::Asset::Wobject::WikiMaster',
@ -30,8 +30,6 @@ my $wiki
groupIdView => '7', # Everyone
} );
WebGUI::Test->addToCleanup( WebGUI::VersionTag->getWorking( $session ) );
#----------------------------------------------------------------------------
# Tests