Commit graph

1163 commits

Author SHA1 Message Date
Doug Bell
795d88e7e5 Merge commit 'v7.10.17' into 8
Conflicts:
	docs/upgrades/upgrade_7.9.13-7.10.0.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/AssetReport.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Form/Captcha.pm
	lib/WebGUI/Macro/AdminBar.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/PayDriver.pm
	lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Workflow/Instance.pm
	lib/WebGUI/Workflow/Spectre.pm
	lib/WebGUI/i18n/English/PayDriver.pm
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Wobject/Thingy.t
2011-06-17 20:13:41 -05:00
Doug Bell
1fa911029d Merge commit '1966cc02a7'
Conflicts:
	lib/WebGUI/Asset/Wobject/Thingy.pm
2011-05-20 14:58:43 -05:00
Doug Bell
c471728ca4 add metadata to assets inside an AssetReport
Thanks to SquOnk for the patch.
2011-05-20 14:25:40 -05:00
Colin Kuskie
e33c41bd43 Add more tests around a test that fails intermittently in AssetLineage.t 2011-05-16 21:57:07 -07:00
Colin Kuskie
aaa2d8e8f2 Update shortcut exporting test for changes to exportGetRelatedAssetIds exporting the container by default. 2011-05-16 21:36:27 -07:00
Colin Kuskie
d796412469 Update Asset/Story.t for changes to exportGetRelatedAssetIds now exporting the container as well. 2011-05-16 21:32:48 -07:00
Paul Driver
4af2c8424f Whoops. Monkey::Patch wasn't used. 2011-05-16 16:17:33 -05:00
Paul Driver
c1a29182ca fixed #12129: AdminBar calls canAdd as an object method 2011-05-16 16:11:42 -05:00
Doug Bell
677ac978b6 Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8
Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
2011-05-13 18:20:52 -05:00
Doug Bell
277faae8a1 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
2011-05-13 18:15:11 -05:00
Scott Walters
96bb194402 Change newByDynamicClass calls that creept in back to newById, except for the ones in doc/upgrade. Kinda important. 2011-05-11 16:26:32 -04:00
Scott Walters
72bac90f93 Rework WebGUI::Test::getPage2 to be a wrapper around WebGUI::Test::Mechanize; this is still just
a crutch for converting tests, though really, it's enough shorter that it probably should live on.
getPage should be deprecated and replaced with getPage2 which should then be renamed.  Joy.
Anyway, WebGUI::Test::Mechanize had a bit of chicken-and-egg going on with not being able to
modify things in its session until after a request with a valid session cookie was made.
It's now more forgiving.
Reworked t/Asset/AssetExportHtml.t slightly to use getPage2 as it currently stands.
2011-05-11 15:26:32 -04:00
Scott Walters
d2c8670098 Introduce WebGUI::Test::getPage2, similar to WebGUI::Test::getPage, that makes
requests using Plack::Test and attempts to maintain getPage's API.
Change three tests in t/Asset/AssetExportHtml.t to use this instead.
Backstory:
Forthcoming WebGUI::Session::HTTP, ::Request, ::Responses mucking abouts broke
some tests that use WebGUI::Test::getPage; in the case of t/Asset/AssetExportHtml.t,
files were written correctly to disc but tests failed because it was comparing them
to undef, which it got back for the page, apparently because getPage bypasses the
logic that traps printing to a filehandle.
2011-05-11 13:58:20 -04:00
Paul Driver
f1538824f7 rfe #12123: Layouts related for export purposes 2011-05-09 10:02:00 -05:00
Doug Bell
61eff5be0c the default URL is /, not the empty string 2011-05-05 19:31:59 -05:00
Doug Bell
36923dc335 class is now className in www_add 2011-05-05 19:29:11 -05:00
Doug Bell
d7339c9ba8 class is now className in www_add 2011-05-05 19:28:29 -05:00
Doug Bell
a476f09e12 Shelf no longer has importProducts or exportProducts, they're AssetHelpers 2011-05-05 16:03:05 -05:00
Doug Bell
65f3f3546f class is now className when doing www_add 2011-05-05 15:56:54 -05:00
Doug Bell
6ae2862bb6 all template vars have "controls" now 2011-05-05 15:55:48 -05:00
Doug Bell
e34d1ad38c shortcut no longer overrides getToolbar, so stop testing it 2011-05-05 15:54:14 -05:00
Doug Bell
ef2727f6f5 update usedBy when redeeming subscription code 2011-05-05 15:52:22 -05:00
Doug Bell
475a885146 shortcut now takes ?visitor=1 to edit visitor prefs from dashboard 2011-05-05 15:52:22 -05:00
Doug Bell
b0da37ec15 fix EMSSubmissionForm and all its tests 2011-05-04 15:33:04 -05:00
Doug Bell
0c23ba8cd7 perhaps a good plan is in order... 2011-05-04 13:57:35 -05:00
Doug Bell
cdcbf53e42 getToolbarState and toggleToolbar no longer exist
The toolbar can be put in any page, and the toggle is now simply
if you are in the Turn Admin On group
2011-05-04 13:51:19 -05:00
Doug Bell
4a8b4c69a2 class is now className for www_add 2011-05-04 13:50:10 -05:00
Doug Bell
2b42142d85 went overboard on deleting from this test 2011-05-04 13:05:18 -05:00
Doug Bell
925a5da1af switchAdminOn no longer exists 2011-05-03 17:43:51 -05:00
Doug Bell
04eb2a4469 switchAdminOn no longer exists 2011-05-03 17:42:33 -05:00
Doug Bell
a311c192d5 SwitchAdminOn/Off no longer exists 2011-05-03 17:36:34 -05:00
Doug Bell
1a589a655d Add missing works for anyone in Turn Admin On 2011-05-03 17:35:06 -05:00
Doug Bell
d80dadb28f www_copy is now only an AssetHelper and is tested there 2011-05-03 17:29:02 -05:00
Colin Kuskie
61534779d5 Add new MapPoint code for geolocation, Thingy searching and indexing and a macro for rendering thing data outside of the Thingy. 2011-05-02 13:49:18 -07:00
Colin Kuskie
d4672a92f1 Consider search fields when doing search in a Thingy normally, or via Ajax. Fixes bug #12117. 2011-04-20 16:05:20 -07:00
Paul Driver
df2e1a5b27 rfe #12105: Make shortcuts related for export purposes 2011-04-13 15:57:50 -05:00
Colin Kuskie
1a462d4835 for exportRelatedAssetIds, Don't create a version tag unless it's needed, and then don't restore it unless it exists. Otherwise, the tag leaks and breaks downstream tests. 2011-04-11 09:32:32 -07:00
Colin Kuskie
f2b5f35d49 Move Article.t over to using the new storage API for checking for storage location existance. 2011-04-11 08:55:44 -07:00
Doug Bell
adb67b2137 add style parameter to template assets to store a style template id 2011-04-07 21:49:23 -05:00
Doug Bell
13e8040190 add setParam, getParam, deleteParam to template assets 2011-04-07 20:46:21 -05:00
Paul Driver
1ff9f09e8b couple more tests for related asset exports 2011-04-06 16:43:23 -05:00
Paul Driver
f8021c3d3d rfe #12093: Remotely stored photos for Story assets 2011-04-05 15:16:45 -05:00
Colin Kuskie
73261e4651 Batch of test cleaups for leaking objects. 2011-04-04 18:57:50 -07:00
Paul Driver
76e9693f4b Export related assets 2011-04-04 18:47:37 -05:00
Paul Driver
5c20e9c0be Fixing a bunch of tests not to rely on HT being default parser 2011-04-04 18:47:18 -05:00
Colin Kuskie
8525e4b7ee Don't refund transactionItems unless the transaction is successful, or if the item is already canceled. Also, no not call onCancelRecurring for normal Sku's unless they're really recurring. Fixes bug #12089. 2011-04-04 14:45:53 -07:00
Paul Driver
3531c4d913 Snippets can now select a template parser
(instead of being restricted to the configured default)
2011-03-31 15:21:07 -05:00
Paul Driver
81f4b44e19 yet another template test failure 2011-03-31 12:42:18 -05:00
Paul Driver
26eb6c5a22 likewise t/Asset/Post/notification.t 2011-03-31 12:30:32 -05:00
Paul Driver
c8098e2ca6 rfe #618: Syndicated Content Asset: Make images in the downloaded RSS-feeds available in the template. 2011-03-30 09:52:55 -05:00