Commit graph

1100 commits

Author SHA1 Message Date
Doug Bell
256119575c fix syntax error in InOutBoard test. still fails 2010-07-15 12:55:29 -05:00
Doug Bell
b993e54bff declare variable to fix test 2010-07-15 12:55:10 -05:00
Doug Bell
cbd53b7aa6 fix bad plan in AssetLineage test 2010-07-15 12:54:52 -05:00
Doug Bell
2471517fa7 remove getAdminConsole from Survey 2010-07-15 12:54:31 -05:00
Doug Bell
708b47d73c Merge remote branch 'upstream/WebGUI8' into 8-merge
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/Navigation.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/Config.pm
	lib/WebGUI/Form/Template.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/VersionTag.pm
	lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
	t/AdSpace.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Story.t
	t/Asset/Template/HTMLTemplateExpr.t
	t/Asset/Wobject/Gallery/00base.t
	t/Asset/Wobject/GalleryAlbum/00base.t
	t/Asset/Wobject/GalleryAlbum/ajax.t
	t/Asset/Wobject/InOutBoard.t
	t/Asset/Wobject/StoryArchive.t
	t/Asset/Wobject/Survey/ExpressionEngine.t
	t/Asset/Wobject/Survey/Reports.t
	t/AssetAspect/RssFeed.t
	t/Auth/mech.t
	t/Group.t
	t/Mail/Send.t
	t/Operation/AdSpace.t
	t/Session/ErrorHandler.t
	t/Session/Scratch.t
	t/Session/Url.t
	t/Shop/Cart.t
	t/Shop/Pay.t
	t/Shop/Ship.t
	t/Shop/ShipDriver.t
	t/Shop/TaxDriver/Generic.t
	t/Shop/Vendor.t
	t/VersionTag.t
	t/lib/WebGUI/Test.pm
2010-07-14 18:20:00 -05:00
Doug Bell
cd1e450c32 Merge branch 'master' into 8-merge
Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
2010-07-14 17:06:19 -05:00
Doug Bell
ef319ea2a2 fix cleanup 2010-07-13 13:12:47 -05:00
Doug Bell
ab7e98d08c test changes to updating serialize asset props 2010-07-13 13:12:47 -05:00
Doug Bell
65e9902001 migrate to JsonTable to edit template attachments 2010-07-13 13:12:46 -05:00
Doug Bell
29b1f794cd fix merge problems 2010-07-12 15:52:38 -05:00
Doug Bell
babfa74209 Merge branch 'master' into 8-merge
Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/Navigation.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/Config.pm
	lib/WebGUI/Form/Template.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Inbox.pm
	lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
	lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
	sbin/testEnvironment.pl
	t/AdSpace.t
	t/AdSpace/Ad.t
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/EMSSubmissionForm.t
	t/Asset/Event.t
	t/Asset/File/GalleryFile/Photo/00base.t
	t/Asset/File/GalleryFile/Photo/comment.t
	t/Asset/File/GalleryFile/Photo/download.t
	t/Asset/File/GalleryFile/Photo/edit.t
	t/Asset/File/GalleryFile/Photo/exif.t
	t/Asset/File/GalleryFile/Photo/makeResolutions.t
	t/Asset/File/GalleryFile/Photo/makeShortcut.t
	t/Asset/File/Image/setfile.t
	t/Asset/File/setfile.t
	t/Asset/Post.t
	t/Asset/Post/Thread/getAdjacentThread.t
	t/Asset/Sku.t
	t/Asset/Sku/ProductCollateral.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Template/HTMLTemplateExpr.t
	t/Asset/Wobject/Gallery/00base.t
	t/Asset/Wobject/GalleryAlbum/00base.t
	t/Asset/Wobject/GalleryAlbum/ajax.t
	t/Asset/Wobject/GalleryAlbum/delete.t
	t/Asset/Wobject/Matrix.t
	t/Asset/Wobject/StoryArchive.t
	t/Asset/Wobject/Survey/ExpressionEngine.t
	t/Asset/Wobject/Survey/Reports.t
	t/AssetAspect/RssFeed.t
	t/Auth/mech.t
	t/Config.t
	t/Group.t
	t/Help/isa.t
	t/International.t
	t/Mail/Send.t
	t/Operation/AdSpace.t
	t/Operation/Auth.t
	t/Pluggable.t
	t/Session.t
	t/Session/DateTime.t
	t/Session/ErrorHandler.t
	t/Session/Scratch.t
	t/Session/Stow.t
	t/Shop/Cart.t
	t/Shop/Pay.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/PayPalStd.t
	t/Shop/Ship.t
	t/Shop/ShipDriver.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Shop/Transaction.t
	t/Shop/Vendor.t
	t/VersionTag.t
	t/Workflow/Activity/ArchiveOldStories.t
	t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
	t/lib/WebGUI/Test.pm
2010-07-09 11:48:30 -05:00
Doug Bell
55dbab152c fix cleanup 2010-07-09 11:04:20 -05:00
Colin Kuskie
655efc49e2 Add tests for double encoding of UTF8 content in Posts and email notificaitons. 2010-07-06 10:23:08 -07:00
Colin Kuskie
bf7c7aad55 Make the view test more robust. It has been failing randomly. 2010-07-04 09:40:19 -07:00
Colin Kuskie
e0177dc666 Remove Session::Env, migrate code to Plack::Request object in Session, and WebGUI::Session::Request 2010-07-01 17:40:12 -07:00
Doug Bell
1ff4a26ea4 test changes to updating serialize asset props 2010-07-01 13:11:55 -05:00
Colin Kuskie
565cf955d7 Merge commit '469c2b72b4' into WebGUI8. All tests passing. 2010-07-01 10:13:22 -07:00
Colin Kuskie
5e502fee53 Merge commit '17ce3572bf' into WebGUI8. All tests passing. 2010-06-30 18:43:27 -07:00
Doug Bell
6cf68e59a2 migrate to JsonTable to edit template attachments 2010-06-30 17:03:50 -05:00
Colin Kuskie
385931aaab Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing. 2010-06-27 22:32:31 -07:00
Colin Kuskie
e5b82bc861 Merge commit '4969f31e1f' into WebGUI8 2010-06-26 14:37:31 -07:00
Colin Kuskie
55ec1788ed Test fixes for cross repo-mixup. 2010-06-26 13:07:53 -07:00
Colin Kuskie
5febc0ebbc Merge commit '41575d24bb' into webgui8. Some tests still failing.
Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm
2010-06-25 23:25:26 -07:00
Colin Kuskie
b30491f3a6 Merge commit '808a866c8b' into webgui8. 7.9.4 release point
Conflicts:
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
	docs/upgrades/upgrade_7.9.2-7.9.3.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Gallery.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	t/Asset/Asset.t
2010-06-25 20:08:11 -07:00
Colin Kuskie
b7ba9f2118 Fix problems with the Story Archive leaking version tags when it is not committed. Fixes bug #11678 2010-06-23 14:12:42 -07:00
Colin Kuskie
05610f7621 Correctly handle the case of finding new lastPost information when a Post is trashed. Fixes bug #11646. 2010-06-21 16:02:29 -07:00
Colin Kuskie
54c56019d1 Update lastPost information in the Thread and CS when a Post is archived. Made a separate method so it can be used by other actions, and in the upgrade script. Fixes bug #11628. 2010-06-21 14:38:46 -07:00
Colin Kuskie
869d12fb82 Fetch a fresh asset to prevent groups from leaking. 2010-06-17 11:31:47 -07:00
Graham Knop
18525e7c1b use callback for log interception instead of on/off 2010-06-17 10:27:09 -05:00
Colin Kuskie
0b2d78ed71 More END block cleanups, 7 to go. 2010-06-15 16:49:34 -07:00
Colin Kuskie
fecc2bec54 Yet more END block cleanups. 2010-06-15 16:40:06 -07:00
Colin Kuskie
1ea2f3ea76 Add tracking to the InOutBoard test to try and find out why it fails intermittently. 2010-06-15 15:13:50 -07:00
Graham Knop
384fc59877 fix template test 2010-06-15 04:31:07 -05:00
Graham Knop
4ace015f4e diag -> note 2010-06-15 03:53:01 -05:00
Colin Kuskie
71d4880635 Another batch of test cleaning. 2010-06-14 19:47:30 -07:00
Colin Kuskie
e878258543 END block cleanup. 2010-06-14 19:39:11 -07:00
Colin Kuskie
94699417a7 END block cleanup. 2010-06-14 18:24:21 -07:00
Colin Kuskie
6c3369d0cb Revert "use temp config file for testing"
This reverts commit 9b725c6d42.
2010-06-14 15:19:54 -07:00
Graham Knop
1c2d10a8b3 fix another test 2010-06-14 10:16:54 -05:00
Graham Knop
30657d61f7 lots of test fixes 2010-06-13 06:19:41 -05:00
Graham Knop
89d4f46a18 Merge branch 'psgi' into WebGUI8 2010-06-11 23:05:06 -05:00
Graham Knop
e063818e2d some URL fixes and removing some uses of PseudoRequest 2010-06-11 23:01:57 -05:00
Colin Kuskie
dcdd671b2c Fix the pending flag, get a fresh copy of the photo asset under test. 2010-06-11 20:18:48 -07:00
Colin Kuskie
416c3737c6 Fix cleaning up some files. Asset->new is not to be used unless you know what you're doing. 2010-06-11 19:45:31 -07:00
Colin Kuskie
7df0cc51ed Always get a fresh copy of the survey after doing revision control. 2010-06-11 19:11:12 -07:00
Colin Kuskie
1e55078ac0 Update this test for WebGUI::Definition; 2010-06-11 18:42:17 -07:00
Colin Kuskie
91d94ab8f7 Update this test for the changes to the Survey. 2010-06-11 12:15:16 -07:00
Colin Kuskie
9b071c1510 Update the JSON collateral test. Duplicate JSONCollateral into a Role so it can be used with Assets. 2010-06-11 11:51:38 -07:00
Colin Kuskie
33640e6e05 Fix a storage clean-up. 2010-06-11 09:19:00 -07:00
Graham Knop
49be76247e mock asset test package 2010-06-10 23:56:40 -05:00