Merge branch 'master' of git@github.com:plainblack/webgui
This commit is contained in:
daviddelikat
commit
9805541a6e
168 changed files with 8536 additions and 3809 deletions
|
|
@ -63,15 +63,14 @@ $testGroups{'canEdit asset'} = WebGUI::Group->new($session, 'new');
|
|||
$testUsers{'canEdit group user'} = WebGUI::User->new($session, 'new');
|
||||
$testUsers{'canEdit group user'}->addToGroups([$testGroups{'canEdit asset'}->getId]);
|
||||
$testUsers{'canEdit group user'}->username('Edit Group User');
|
||||
WebGUI::Test->groupsToDelete($testGroups{'canEdit asset'});
|
||||
addToCleanup($testGroups{'canEdit asset'});
|
||||
|
||||
##A group and user for groupIdEdit
|
||||
$testGroups{'canAdd asset'} = WebGUI::Group->new($session, 'new');
|
||||
$testUsers{'canAdd group user'} = WebGUI::User->new($session, 'new');
|
||||
$testUsers{'canAdd group user'}->addToGroups([$testGroups{'canAdd asset'}->getId]);
|
||||
$testUsers{'canEdit group user'}->username('Can Add Group User');
|
||||
WebGUI::Test->groupsToDelete($testGroups{'canAdd asset'});
|
||||
WebGUI::Test->usersToDelete(values %testUsers);
|
||||
addToCleanup($testGroups{'canAdd asset'}, values %testUsers);
|
||||
|
||||
my $canAddMaker = WebGUI::Test::Maker::Permission->new();
|
||||
$canAddMaker->prepare({
|
||||
|
|
@ -104,7 +103,7 @@ $properties = {
|
|||
};
|
||||
|
||||
my $versionTag2 = WebGUI::VersionTag->getWorking($session);
|
||||
WebGUI::Test->tagsToRollback($versionTag2);
|
||||
addToCleanup($versionTag2);
|
||||
|
||||
my $canEditAsset = $rootAsset->addChild($properties, $properties->{id});
|
||||
|
||||
|
|
@ -120,7 +119,7 @@ $canEditMaker->prepare({
|
|||
});
|
||||
|
||||
my $versionTag3 = WebGUI::VersionTag->getWorking($session);
|
||||
WebGUI::Test->tagsToRollback($versionTag3);
|
||||
addToCleanup($versionTag3);
|
||||
$properties = {
|
||||
# '1234567890123456789012'
|
||||
id => 'canViewAsset0000000010',
|
||||
|
|
@ -153,7 +152,7 @@ $canViewMaker->prepare(
|
|||
},
|
||||
);
|
||||
|
||||
plan tests => 116
|
||||
plan tests => 126
|
||||
+ scalar(@fixIdTests)
|
||||
+ scalar(@fixTitleTests)
|
||||
+ 2*scalar(@getTitleTests) #same tests used for getTitle and getMenuTitle
|
||||
|
|
@ -303,7 +302,7 @@ $session->{_request} = $origRequest;
|
|||
################################################################
|
||||
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
WebGUI::Test->tagsToRollback($versionTag);
|
||||
addToCleanup($versionTag);
|
||||
$versionTag->set({name=>"Asset tests"});
|
||||
|
||||
$properties = {
|
||||
|
|
@ -744,7 +743,7 @@ $product3->purge;
|
|||
################################################################
|
||||
|
||||
my $versionTag4 = WebGUI::VersionTag->getWorking($session);
|
||||
WebGUI::Test->tagsToRollback($versionTag4);
|
||||
addToCleanup($versionTag4);
|
||||
$versionTag4->set( { name => 'inheritUrlFromParent tests' } );
|
||||
|
||||
$properties = {
|
||||
|
|
@ -890,7 +889,6 @@ $session->log->warn('parent asset is now committed');
|
|||
is( $testVersionTag->get('isCommitted'), 1, 'parent asset is now committed' );
|
||||
|
||||
$childVersionTag = WebGUI::VersionTag->new( $session, $childAsset->get('tagId') );
|
||||
$session->log->warn('child asset is now committed');
|
||||
is( $childVersionTag->get('isCommitted'), 1, 'child asset is now committed' );
|
||||
|
||||
################################################################
|
||||
|
|
@ -901,12 +899,58 @@ is( $childVersionTag->get('isCommitted'), 1, 'child asset is now committed' );
|
|||
|
||||
my $assetToCommit = $defaultAsset->addChild({ className => 'WebGUI::Asset::Snippet', title => 'Snippet to commit and clone from db', });
|
||||
my $cloneTag = WebGUI::VersionTag->getWorking($session);
|
||||
WebGUI::Test->tagsToRollback($cloneTag);
|
||||
addToCleanup($cloneTag);
|
||||
$cloneTag->commit;
|
||||
is($assetToCommit->get('status'), 'pending', 'cloneFromDb: local asset is still pending');
|
||||
$assetToCommit = $assetToCommit->cloneFromDb;
|
||||
is($assetToCommit->get('status'), 'approved', '... returns fresh, commited asset from the db');
|
||||
|
||||
################################################################
|
||||
#
|
||||
# checkView
|
||||
#
|
||||
################################################################
|
||||
|
||||
my $trashedAsset = $defaultAsset->addChild({
|
||||
className => 'WebGUI::Asset::Snippet', title => 'Trashy',
|
||||
});
|
||||
|
||||
my $clippedAsset = $defaultAsset->addChild({
|
||||
className => 'WebGUI::Asset::Snippet', title => 'Clippy',
|
||||
});
|
||||
|
||||
my $checkTag = WebGUI::VersionTag->getWorking($session);
|
||||
$checkTag->commit;
|
||||
addToCleanup($checkTag);
|
||||
$trashedAsset = $trashedAsset->cloneFromDb;
|
||||
$clippedAsset = $clippedAsset->cloneFromDb;
|
||||
$trashedAsset->trash;
|
||||
$clippedAsset->cut;
|
||||
is $trashedAsset->get('state'), 'trash', 'checkView setup: trashed an asset';
|
||||
is $clippedAsset->get('state'), 'clipboard', '... clipped an asset';
|
||||
|
||||
$session->var->switchAdminOff;
|
||||
$session->http->setRedirectLocation('');
|
||||
$session->http->setStatus(200, 'OK');
|
||||
|
||||
$trashedAsset->checkView();
|
||||
is $session->http->getStatus, 410, '... status set to 410 for trashed asset';
|
||||
is $session->http->getRedirectLocation, '', '... no redirect set';
|
||||
|
||||
$session->http->setStatus(200, 'OK');
|
||||
$clippedAsset->checkView();
|
||||
is $session->http->getStatus, 410, '... status set to 410 for cut asset';
|
||||
is $session->http->getRedirectLocation, '', '... no redirect set';
|
||||
|
||||
$session->var->switchAdminOn;
|
||||
$session->http->setStatus(200, 'OK');
|
||||
is $trashedAsset->checkView(), 'chunked', '... returns "chunked" when admin is on for trashed asset';
|
||||
is $session->http->getRedirectLocation, $trashedAsset->getUrl('func=manageTrash'), '... trashed asset sets redirect to manageTrash';
|
||||
|
||||
$session->http->setRedirectLocation('');
|
||||
is $clippedAsset->checkView(), 'chunked', 'checkView: returns "chunked" when admin is on for cut asset';
|
||||
is $session->http->getRedirectLocation, $clippedAsset->getUrl('func=manageClipboard'), '... cut asset sets redirect to manageClipboard';
|
||||
|
||||
##Return an array of hashrefs. Each hashref describes a test
|
||||
##for the fixId method.
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ use Data::Dumper;
|
|||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
use Test::More tests => 21; # increment this value for each test you create
|
||||
use Test::More tests => 22; # increment this value for each test you create
|
||||
use Test::Deep;
|
||||
use WebGUI::Asset::Wobject::SyndicatedContent;
|
||||
use XML::FeedPP;
|
||||
|
|
@ -162,9 +162,6 @@ $cache->set($rssContent, 60);
|
|||
|
||||
my $filteredFeed = $syndicated_content->generateFeed();
|
||||
|
||||
use Data::Dumper;
|
||||
diag Dumper($filteredFeed->get_item());
|
||||
|
||||
cmp_deeply(
|
||||
[ map { $_->title } $filteredFeed->get_item() ],
|
||||
[
|
||||
|
|
@ -176,3 +173,34 @@ cmp_deeply(
|
|||
);
|
||||
|
||||
$cache->delete;
|
||||
|
||||
####################################################################
|
||||
#
|
||||
# Odd feeds
|
||||
#
|
||||
####################################################################
|
||||
|
||||
|
||||
##Feed with no links or pubDates.
|
||||
my $oncpUrl = 'http://www.oncp.gob.ve/oncp.xml';
|
||||
$syndicated_content->update({
|
||||
rssUrl => $oncpUrl,
|
||||
hasTerms => '',
|
||||
maxHeadlines => 50,
|
||||
});
|
||||
|
||||
my $cache = WebGUI::Cache->new($session, $oncpUrl, 'RSS');
|
||||
open my $rssFile, '<', WebGUI::Test->getTestCollateralPath('oncp.xml')
|
||||
or die "Unable to get RSS file: oncp.xml";
|
||||
my $rssContent = do { local $/; <$rssFile>; };
|
||||
close $rssFile;
|
||||
$cache->set($rssContent, 60);
|
||||
|
||||
my $oddFeed1 = $syndicated_content->generateFeed();
|
||||
|
||||
my @oddItems = $oddFeed1->get_item();
|
||||
is (@oddItems, 13, 'feed has items even without pubDates or links');
|
||||
|
||||
$cache->delete;
|
||||
|
||||
|
||||
|
|
|
|||
11
t/DateTime.t
11
t/DateTime.t
|
|
@ -26,7 +26,7 @@ my $session = WebGUI::Test->session;
|
|||
|
||||
# put your tests here
|
||||
|
||||
plan tests => 25;
|
||||
plan tests => 28;
|
||||
|
||||
my $timeZoneUser = addUser($session);
|
||||
|
||||
|
|
@ -84,6 +84,13 @@ is(
|
|||
'... has correct epoch'
|
||||
);
|
||||
|
||||
my $badday = eval { WebGUI::DateTime->new($session, '2001-08-161'); };
|
||||
ok($@, 'new croaks on a bad date');
|
||||
my $badday = eval { WebGUI::DateTime->new($session, '2001-08-16 99:99:99'); };
|
||||
ok($@, 'new croaks on an out of range time');
|
||||
my $badday = eval { WebGUI::DateTime->new($session, '2001-08-16 99:199:99'); };
|
||||
ok($@, 'new croaks on an illegal time');
|
||||
|
||||
sub addUser {
|
||||
my $session = shift;
|
||||
my $user = WebGUI::User->new($session, "new");
|
||||
|
|
@ -92,6 +99,6 @@ sub addUser {
|
|||
##so the test will not fail in the summer
|
||||
$user->profileField("timeZone","America/Hermosillo");
|
||||
$user->username("Time Zone");
|
||||
WebGUI::Test->usersToDelete($user);
|
||||
addToCleanup($user);
|
||||
return $user;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ my $testBlock = [
|
|||
|
||||
my $formType = 'date';
|
||||
|
||||
my $numTests = 25 + scalar @{ $testBlock } ;
|
||||
my $numTests = 26 + scalar @{ $testBlock } ;
|
||||
|
||||
|
||||
plan tests => $numTests;
|
||||
|
|
@ -141,6 +141,14 @@ is(
|
|||
'2008-08-01',
|
||||
"toHtml: defaultValue in epoch format, returns date in mysql format"
|
||||
);
|
||||
|
||||
$date2 = WebGUI::Form::Date->new($session, {defaultValue => '2008-008-001'});
|
||||
is(
|
||||
getValueFromForm($session, $date2->toHtml),
|
||||
'1970-01-01',
|
||||
"toHtml: defaultValue in bad mysql format returns date from epoch 0"
|
||||
);
|
||||
|
||||
$date2 = WebGUI::Form::Date->new($session, {defaultValue => -1});
|
||||
is($date2->getValueAsHtml(), '12/31/1969', "getValueAsHtml: defaultValue as negative epoch, returns in users's format");
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ my $session = WebGUI::Test->session;
|
|||
|
||||
my $formType = 'datetime';
|
||||
|
||||
my $numTests = 34;
|
||||
my $numTests = 35;
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
|
|
@ -182,6 +182,12 @@ is(
|
|||
'2001-08-16 08:00:00',
|
||||
"toHtml: defaultValue in mysql format, value as mysql returns date in mysql format, adjusted for time zone"
|
||||
);
|
||||
$date2 = WebGUI::Form::DateTime->new($session, {defaultValue => '2008-081-01 11:34:26',});
|
||||
is(
|
||||
getValueFromForm($session, $date2->toHtml),
|
||||
'1969-12-31 18:00:00',
|
||||
"toHtml: defaultValue in bad mysql format, returns value from epoch 0, adjusted for user time zone"
|
||||
);
|
||||
|
||||
sub getValueFromForm {
|
||||
my ($session, $textForm) = @_;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ my $session = WebGUI::Test->session;
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
# Tests
|
||||
plan tests => 25;
|
||||
plan tests => 26;
|
||||
|
||||
use_ok('WebGUI::Workflow::Activity::ExpireIncompleteSurveyResponses');
|
||||
|
||||
|
|
@ -127,6 +127,13 @@ $session->db->write('update Survey_response set endDate = 0, isComplete = 0 wher
|
|||
# Make sure SQL only returns 1 incomplete response
|
||||
is( scalar $session->db->buildArray($SQL), 1, 'Make sure SQL only returns 1 incomplete response');
|
||||
|
||||
##
|
||||
# Make sure workflow handles responses for deleted users
|
||||
#
|
||||
$session->db->write('update Survey_response set userId = ? where Survey_responseId = ?', ['not-a-user-id', $responseId]);
|
||||
is( scalar $session->db->buildArray($SQL), 1, 'Still returns 1 row, even though user does not exist (sql left outer join)');
|
||||
$session->db->write('update Survey_response set userId = ? where Survey_responseId = ?', [$user->getId, $responseId]);
|
||||
|
||||
##
|
||||
# Delete Expired
|
||||
##
|
||||
|
|
|
|||
95
t/supporting_collateral/oncp.xml
Normal file
95
t/supporting_collateral/oncp.xml
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1" ?>
|
||||
<rss version="2.0"><channel>
|
||||
<title><![CDATA[Oficina Nacional de Crédito Público]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description>Información Financiera</description>
|
||||
<language>es-ve</language>
|
||||
<copyright>Oficina Nacional de Crédito Público - 2009</copyright>
|
||||
<image>
|
||||
<title>Oficina Nacional de Crédito Público</title>
|
||||
<url>http://www.oncp.gob.ve/data/themes/digital//banner/oncp.png</url>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
</image>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Deuda Interna I Sem 09 / MM US$ 20.441]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[MM US$ 20.441]]></description>
|
||||
<guid isPermaLink="true">http://www.oncp.gob.ve</guid>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Deuda Externa I Sem 09 / MM US$ 29.894]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[MM US$ 29.894]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Tasa Pasiva / 14,52%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[14,52%]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Tasa Activa / 19,56%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[19,56%]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Variación PIB II Trimestre / -2,4%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[-2,4%]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[PIB II Trimestre 2009 / M BsF 13.979.77]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[M BsF 13.979.77]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Unidad Tributaria / BsF. 55,00]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[BsF. 55,00]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Cesta Venezolana / US$ 65,32]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[US$ 65,32]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Cesta OPEP / US$ 67,92]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[US$ 67,92]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Variación Acumuladaa / 15,6%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[15,6%]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[IPC Variación Agosto 2009 / 2,2%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[2,2%]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Reservas Internacionales con BCV + FEM / MM US$ 33.213 (32.384 + 829)]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[MM US$ 33.213 (32.384 + 829)]]></description>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title><![CDATA[Variación Acumulada / 15,6%]]></title>
|
||||
<link>http://www.oncp.gob.ve</link>
|
||||
<description><![CDATA[15,6%]]></description>
|
||||
</item>
|
||||
|
||||
|
||||
</channel>
|
||||
</rss>
|
||||
Loading…
Add table
Add a link
Reference in a new issue