Merge commit 'v7.10.15' into 8
Conflicts: docs/gotcha.txt docs/previousVersion.sql docs/templates.txt lib/WebGUI.pm lib/WebGUI/Asset.pm lib/WebGUI/Asset/Event.pm lib/WebGUI/Asset/File.pm lib/WebGUI/Asset/MapPoint.pm lib/WebGUI/Asset/RichEdit.pm lib/WebGUI/Asset/Sku/Product.pm lib/WebGUI/Asset/Snippet.pm lib/WebGUI/Asset/Story.pm lib/WebGUI/Asset/Template.pm lib/WebGUI/Asset/Template/TemplateToolkit.pm lib/WebGUI/Asset/Wobject/Calendar.pm lib/WebGUI/Asset/Wobject/Carousel.pm lib/WebGUI/Asset/Wobject/Collaboration.pm lib/WebGUI/Asset/Wobject/Dashboard.pm lib/WebGUI/Asset/Wobject/DataForm.pm lib/WebGUI/Asset/Wobject/Folder.pm lib/WebGUI/Asset/Wobject/Map.pm lib/WebGUI/Asset/Wobject/Search.pm lib/WebGUI/Asset/Wobject/Shelf.pm lib/WebGUI/Asset/Wobject/StockData.pm lib/WebGUI/Asset/Wobject/StoryTopic.pm lib/WebGUI/Asset/Wobject/SyndicatedContent.pm lib/WebGUI/Asset/Wobject/Thingy.pm lib/WebGUI/Asset/Wobject/WeatherData.pm lib/WebGUI/AssetClipboard.pm lib/WebGUI/AssetCollateral/DataForm/Entry.pm lib/WebGUI/AssetExportHtml.pm lib/WebGUI/AssetLineage.pm lib/WebGUI/AssetMetaData.pm lib/WebGUI/AssetTrash.pm lib/WebGUI/AssetVersioning.pm lib/WebGUI/Auth.pm lib/WebGUI/Cache/CHI.pm lib/WebGUI/Content/AssetManager.pm lib/WebGUI/Fork/ProgressBar.pm lib/WebGUI/Form/JsonTable.pm lib/WebGUI/Form/TimeField.pm lib/WebGUI/Form/Zipcode.pm lib/WebGUI/Group.pm lib/WebGUI/International.pm lib/WebGUI/Macro/AssetProxy.pm lib/WebGUI/Macro/FileUrl.pm lib/WebGUI/Operation/SSO.pm lib/WebGUI/Operation/User.pm lib/WebGUI/Role/Asset/Subscribable.pm lib/WebGUI/Shop/Cart.pm lib/WebGUI/Shop/Transaction.pm lib/WebGUI/Shop/TransactionItem.pm lib/WebGUI/Test.pm lib/WebGUI/URL/Content.pm lib/WebGUI/URL/Uploads.pm lib/WebGUI/User.pm lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm lib/WebGUI/Workflow/Activity/SendNewsletters.pm lib/WebGUI/i18n/English/Asset.pm lib/WebGUI/i18n/English/WebGUI.pm sbin/installClass.pl sbin/rebuildLineage.pl sbin/search.pl sbin/testEnvironment.pl t/Asset/Asset.t t/Asset/AssetClipboard.t t/Asset/AssetLineage.t t/Asset/AssetMetaData.t t/Asset/Event.t t/Asset/File.t t/Asset/File/Image.t t/Asset/Post/notification.t t/Asset/Sku.t t/Asset/Story.t t/Asset/Template.t t/Asset/Wobject/Collaboration/templateVariables.t t/Asset/Wobject/Collaboration/unarchiveAll.t t/Asset/Wobject/Shelf.t t/Auth.t t/Macro/EditableToggle.t t/Macro/FilePump.t t/Shop/Cart.t t/Shop/Transaction.t t/Storage.t t/User.t t/Workflow.t
This commit is contained in:
Doug Bell
commit
277faae8a1
783 changed files with 32041 additions and 25495 deletions
|
|
@ -17,12 +17,13 @@ use WebGUI::Asset::Wobject::Calendar;
|
|||
|
||||
use Test::More;
|
||||
use Test::Deep;
|
||||
use Test::LongString;
|
||||
use Data::Dumper;
|
||||
|
||||
plan skip_all => 'set WEBGUI_LIVE to enable this test'
|
||||
unless $ENV{WEBGUI_LIVE};
|
||||
|
||||
plan tests => 14; # increment this value for each test you create
|
||||
plan tests => 23; # increment this value for each test you create
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
|
|
@ -36,9 +37,8 @@ my $receiver = $home->addChild({
|
|||
title => 'Receiving Calendar',
|
||||
});
|
||||
|
||||
$receiver->addFeed({
|
||||
my $feedId = $receiver->addFeed({
|
||||
url => $session->url->getSiteURL.$session->url->gateway($sender->getUrl('func=ical')),
|
||||
feedType => 'ical',
|
||||
lastUpdated => 'never',
|
||||
});
|
||||
|
||||
|
|
@ -60,10 +60,46 @@ my $party = $sender->addChild({
|
|||
ownerUserId => 3,
|
||||
}, undef, undef, {skipAutoCommitWorkflows => 1});
|
||||
|
||||
my $ical_feed = <<"EOICAL";
|
||||
BEGIN:VCALENDAR
|
||||
PRODID:-//Oregon State University//NONSGML Web Calendar//EN
|
||||
VERSION:2.0
|
||||
BEGIN:VEVENT
|
||||
UID:20110426T010000Z-51795\@calendar.oregonstate.edu
|
||||
CLASS:PUBLIC
|
||||
SUMMARY:CPR/AED for the Professional Rescuer
|
||||
DESCRIPTION:This class is designed for any individual who has a duty to res
|
||||
pond to emergencies. It combines lectures and video with hands-on sk
|
||||
ill training and it incorporates real-life rescue scenarios and lessons th
|
||||
at reinforce decision-making skills. This class covers Adult/Child A
|
||||
ED & CPR and Infant CPR; two-person CPR; use of a bag-valve mask; a
|
||||
nd introduction to Emergency Medical Services and bloodbourne pathogens.**
|
||||
This course meets Level C CPR requirements. It is the pre-requisite
|
||||
for most nursing and EMT programs. ** Course continues Tuesday \
|
||||
;April 26, 6:00pm - 10:00pm Dixon Upper Classroom.
|
||||
DTSTART:20110426T010000Z
|
||||
DTEND:20110426T050000Z
|
||||
LAST-MODIFIED:20110301T215024Z
|
||||
CREATED:20110301T215024Z
|
||||
DTSTAMP:20110301T215024Z
|
||||
CONTACT:Recreation Services
|
||||
END:VEVENT
|
||||
END:VCALENDAR
|
||||
EOICAL
|
||||
|
||||
my $snippet_feed = $home->addChild({
|
||||
className => 'WebGUI::Asset::Snippet',
|
||||
url => 'icalFeed.ics',
|
||||
snippet => $ical_feed,
|
||||
mimeType => 'text/calendar',
|
||||
});
|
||||
|
||||
my $tag = WebGUI::VersionTag->getWorking($session);
|
||||
$tag->commit;
|
||||
WebGUI::Test->addToCleanup($tag);
|
||||
|
||||
$snippet_feed = $snippet_feed->cloneFromDb;
|
||||
|
||||
my $workflow = WebGUI::Workflow->create($session,
|
||||
{
|
||||
enabled => 1,
|
||||
|
|
@ -94,35 +130,75 @@ $instance1->delete;
|
|||
|
||||
my $newEvents = $receiver->getLineage(['children'], { returnObjects => 1, });
|
||||
|
||||
is(scalar @{ $newEvents }, 1, 'ical import of 1 event');
|
||||
my $anniversary = pop @{ $newEvents };
|
||||
my $got_anniversary = is(scalar @{ $newEvents }, 1, 'ical import of 1 event');
|
||||
|
||||
is($anniversary->get('title'), $party->get('title'), 'transferred title');
|
||||
is($anniversary->get('menuTitle'), $party->get('menuTitle'), '... menuTitle');
|
||||
is($anniversary->get('groupIdView'), $party->get('groupIdView'), '... groupIdView');
|
||||
is($anniversary->get('groupIdEdit'), $party->get('groupIdEdit'), '... groupIdEdit');
|
||||
is($anniversary->get('url'), $party->get('url').'2', '... url (accounting for duplicate)');
|
||||
is($anniversary->get('description'), $party->get('description'), '... description, checks for line wrapping');
|
||||
SKIP: {
|
||||
skip "No event recieved", 15 unless $got_anniversary;
|
||||
my $anniversary = pop @{ $newEvents };
|
||||
|
||||
$party->update({description => "one line\nsecond line"});
|
||||
is($anniversary->get('title'), $party->get('title'), 'transferred title');
|
||||
is($anniversary->get('menuTitle'), $party->get('menuTitle'), '... menuTitle');
|
||||
is($anniversary->get('groupIdView'), $party->get('groupIdView'), '... groupIdView');
|
||||
is($anniversary->get('groupIdEdit'), $party->get('groupIdEdit'), '... groupIdEdit');
|
||||
is($anniversary->get('url'), $party->get('url').'2', '... url (accounting for duplicate)');
|
||||
is($anniversary->get('timeZone'), $party->get('timeZone'), '... timeZone');
|
||||
is($anniversary->get('startDate'), $party->get('startDate'), '... startDate');
|
||||
is($anniversary->get('startTime'), $party->get('startTime'), '... startTime');
|
||||
is($anniversary->get('endDate'), $party->get('endDate'), '... endDate');
|
||||
is($anniversary->get('endTime'), $party->get('endTime'), '... endTime');
|
||||
is_string($anniversary->get('description'), $party->get('description'), '... description, checks for line wrapping');
|
||||
|
||||
my $instance2 = WebGUI::Workflow::Instance->create($session,
|
||||
$party->update({description => "one line\nsecond line"});
|
||||
|
||||
my $instance2 = WebGUI::Workflow::Instance->create($session,
|
||||
{
|
||||
workflowId => $workflow->getId,
|
||||
skipSpectreNotification => 1,
|
||||
}
|
||||
);
|
||||
|
||||
$retVal = $instance2->run();
|
||||
is($retVal, 'complete', 'cleanup: 2nd activity complete');
|
||||
$retVal = $instance2->run();
|
||||
is($retVal, 'done', 'cleanup: 2nd activity is done');
|
||||
|
||||
$newEvents = $receiver->getLineage(['children'], { returnObjects => 1, });
|
||||
|
||||
is(scalar @{ $newEvents }, 1, 'reimport does not create new children');
|
||||
$anniversary = pop @{ $newEvents };
|
||||
is($anniversary->get('description'), $party->get('description'), '... description, checks for line unwrapping');
|
||||
$anniversary->purge;
|
||||
}
|
||||
|
||||
##Add an ical feed to check time zone processing
|
||||
|
||||
$receiver->deleteFeed($feedId);
|
||||
$receiver->addFeed({
|
||||
url => $session->url->getSiteURL.$snippet_feed->getUrl,
|
||||
lastUpdated => 'never',
|
||||
});
|
||||
|
||||
$oldEvents = $receiver->getLineage(['children'], { returnObjects => 1, });
|
||||
is(scalar @{ $oldEvents }, 0, 'receiving calendar has no events');
|
||||
|
||||
$instance1->delete('skipNotify');
|
||||
$instance1 = WebGUI::Workflow::Instance->create($session,
|
||||
{
|
||||
workflowId => $workflow->getId,
|
||||
skipSpectreNotification => 1,
|
||||
}
|
||||
);
|
||||
|
||||
$retVal = $instance2->run();
|
||||
is($retVal, 'complete', 'cleanup: 2nd activity complete');
|
||||
$retVal = $instance2->run();
|
||||
is($retVal, 'done', 'cleanup: 2nd activity is done');
|
||||
my $retVal;
|
||||
|
||||
$retVal = $instance1->run();
|
||||
is($retVal, 'complete', 'cleanup: activity complete');
|
||||
$retVal = $instance1->run();
|
||||
is($retVal, 'done', 'cleanup: activity is done');
|
||||
$instance1->delete;
|
||||
|
||||
$newEvents = $receiver->getLineage(['children'], { returnObjects => 1, });
|
||||
|
||||
is(scalar @{ $newEvents }, 1, 'reimport does not create new children');
|
||||
$anniversary = pop @{ $newEvents };
|
||||
is($anniversary->get('description'), $party->get('description'), '... description, checks for line unwrapping');
|
||||
my $got_cpr = is(scalar @{ $newEvents }, 1, 'ical import of 1 event');
|
||||
|
||||
#vim:ft=perl
|
||||
|
|
|
|||
|
|
@ -32,9 +32,25 @@ my $event = $calendar->addChild(
|
|||
{ className => 'WebGUI::Asset::Event',
|
||||
startDate => $one_year_ago,
|
||||
endDate => $one_year_ago,
|
||||
}
|
||||
}, undef, undef, {skipAutoCommitWorkflows => 1, }
|
||||
);
|
||||
|
||||
my $trashed_event = $calendar->addChild(
|
||||
{ className => 'WebGUI::Asset::Event',
|
||||
startDate => $one_year_ago,
|
||||
endDate => $one_year_ago,
|
||||
}, undef, undef, {skipAutoCommitWorkflows => 1, }
|
||||
);
|
||||
$trashed_event->trash;
|
||||
|
||||
my $clipped_event = $calendar->addChild(
|
||||
{ className => 'WebGUI::Asset::Event',
|
||||
startDate => $one_year_ago,
|
||||
endDate => $one_year_ago,
|
||||
}, undef, undef, {skipAutoCommitWorkflows => 1, }
|
||||
);
|
||||
$clipped_event->cut;
|
||||
|
||||
my $recurId = $event->setRecurrence(
|
||||
{ recurType => 'monthDay',
|
||||
every => 2,
|
||||
|
|
@ -43,6 +59,22 @@ my $recurId = $event->setRecurrence(
|
|||
}
|
||||
);
|
||||
|
||||
$trashed_event->setRecurrence(
|
||||
{ recurType => 'monthDay',
|
||||
every => 2,
|
||||
startDate => $trashed_event->get('startDate'),
|
||||
dayNumber => $eventStartDate->day,
|
||||
}
|
||||
);
|
||||
|
||||
$clipped_event->setRecurrence(
|
||||
{ recurType => 'monthDay',
|
||||
every => 2,
|
||||
startDate => $clipped_event->get('startDate'),
|
||||
dayNumber => $eventStartDate->day,
|
||||
}
|
||||
);
|
||||
|
||||
my $workflow = WebGUI::Workflow->create(
|
||||
$session, {
|
||||
enabled => 1,
|
||||
|
|
@ -83,17 +115,21 @@ while (my $status = $instance->run ne 'complete') {
|
|||
last if $count++ > 30;
|
||||
}
|
||||
|
||||
my $sql = q{
|
||||
select e.startDate, e.endDate
|
||||
from asset a
|
||||
inner join Event e on e.assetId = a.assetId
|
||||
and a.parentId = ?
|
||||
order by e.startDate
|
||||
};
|
||||
#my $sql = q{
|
||||
# select e.startDate, e.endDate
|
||||
# from asset a
|
||||
# inner join Event e on e.assetId = a.assetId
|
||||
# and a.parentId = ?
|
||||
# order by e.startDate
|
||||
#};
|
||||
|
||||
my $dates = $session->db->buildArrayRefOfHashRefs($sql, [$calendar->getId]);
|
||||
#my $dates = $session->db->buildArrayRefOfHashRefs($sql, [$calendar->getId]);
|
||||
my $dates = $calendar->getLineage(['children'], { returnObjects => 1, });
|
||||
# 3 years at every other month (6 times) plus the one we started with
|
||||
is(@$dates, 19) or diag Dumper $dates;
|
||||
is(@{$dates}, 19, 'created right number of dates') or diag Dumper $dates;
|
||||
|
||||
my @uncommitted_events = grep { $_->get('status') ne 'approved' } @{ $dates };
|
||||
is @uncommitted_events, 0, 'all events are committed (approved)';
|
||||
|
||||
done_testing;
|
||||
|
||||
|
|
|
|||
83
t/Workflow/Activity/UpdateAssetSubscribers.t
Normal file
83
t/Workflow/Activity/UpdateAssetSubscribers.t
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
|
||||
#-------------------------------------------------------------------
|
||||
# Please read the legal notices (docs/legal.txt) and the license
|
||||
# (docs/license.txt) that came with this distribution before using
|
||||
# this software.
|
||||
#-------------------------------------------------------------------
|
||||
# http://www.plainblack.com info@plainblack.com
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
use FindBin;
|
||||
use strict;
|
||||
use lib "$FindBin::Bin/../../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Workflow::Activity::UpdateAssetSubscribers;
|
||||
use WebGUI::Asset;
|
||||
|
||||
use Test::More;
|
||||
use Test::Deep;
|
||||
|
||||
plan tests => 4; # increment this value for each test you create
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
$session->user({userId => 3});
|
||||
|
||||
my $subscriberGroup = WebGUI::Group->new($session, "new"); ##Group to hold subscribers
|
||||
my $oldGroup = WebGUI::Group->new($session, "new"); ##Pretend group, old groupIdView
|
||||
my $betterGroup = WebGUI::Group->new($session, "new"); ##New group for groupIdView
|
||||
my $oldUser = WebGUI::User->create($session); ##User who should be unsubscribed
|
||||
my $betterUser = WebGUI::User->create($session); ##User who should remain subscribed
|
||||
my $otherUser = WebGUI::User->create($session); ##Just a user, we should never see him
|
||||
my $root = WebGUI::Test->asset;
|
||||
my $cs = $root->addChild({
|
||||
className => 'WebGUI::Asset::Wobject::Collaboration',
|
||||
title => 'Test Calendar',
|
||||
subscriptionGroupId => $subscriberGroup->getId,
|
||||
groupIdView => $betterGroup->getId,
|
||||
});
|
||||
WebGUI::Test->addToCleanup($oldGroup, $subscriberGroup, $betterGroup, $oldUser, $betterUser, $otherUser);
|
||||
|
||||
$subscriberGroup->addUsers([$oldUser->getId, $betterUser->getId, ]);
|
||||
$betterGroup->addUsers([$betterUser->getId, ]);
|
||||
|
||||
##Plan, since spectre isn't running, we manually simulate an update event and run the
|
||||
##workflow activity by hand.
|
||||
|
||||
cmp_bag(
|
||||
$subscriberGroup->getUsers,
|
||||
[$oldUser->getId, $betterUser->getId],
|
||||
'Initial subscribers are correct'
|
||||
);
|
||||
|
||||
##This workflowId needs to exist, since it's hardcoded in the CS asset
|
||||
my $workflow = WebGUI::Workflow->new($session, 'xR-_GRRbjBojgLsFx3dEMA');
|
||||
|
||||
my $instance1 = WebGUI::Workflow::Instance->create($session,
|
||||
{
|
||||
workflowId => $workflow->getId,
|
||||
skipSpectreNotification => 1,
|
||||
className => 'WebGUI::Asset',
|
||||
methodName => 'newById',
|
||||
parameters => $cs->getId,
|
||||
}
|
||||
);
|
||||
WebGUI::Test->addToCleanup($instance1);
|
||||
|
||||
my $retVal;
|
||||
|
||||
$retVal = $instance1->run();
|
||||
is($retVal, 'complete', 'cleanup: activity complete');
|
||||
$retVal = $instance1->run();
|
||||
is($retVal, 'done', 'cleanup: activity is done');
|
||||
$instance1->delete('skipNotify');
|
||||
|
||||
$subscriberGroup->clearCaches;
|
||||
|
||||
cmp_bag(
|
||||
$subscriberGroup->getUsers,
|
||||
[$betterUser->getId],
|
||||
'Corrent user removed'
|
||||
);
|
||||
Loading…
Add table
Add a link
Reference in a new issue