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:
commit
277faae8a1
783 changed files with 32041 additions and 25495 deletions
|
|
@ -15,12 +15,14 @@
|
|||
|
||||
use strict;
|
||||
use Test::More;
|
||||
use Test::Deep;
|
||||
use Scalar::Util qw/refaddr/;
|
||||
use WebGUI::Test; # Must use this before any other WebGUI modules
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Asset;
|
||||
use WebGUI::Shop::Cart;
|
||||
use WebGUI::TestException;
|
||||
use JSON 'from_json';
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
|
@ -31,7 +33,7 @@ my $i18n = WebGUI::International->new($session, "Shop");
|
|||
#----------------------------------------------------------------------------
|
||||
# Tests
|
||||
|
||||
plan tests => 29; # Increment this number for each test you create
|
||||
plan tests => 35; # Increment this number for each test you create
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# put your tests here
|
||||
|
|
@ -173,5 +175,47 @@ $cart->delete;
|
|||
is($cart->delete, undef, "Can destroy cart.");
|
||||
|
||||
|
||||
# Test (shipping part of) www_ajaxPrices
|
||||
{
|
||||
local *WebGUI::Shop::Ship::getOptions = sub { [ qw{ a b c } ] };
|
||||
|
||||
$cart->update( { shippingAddressId => $address->getId } );
|
||||
|
||||
my $response = from_json $cart->www_ajaxPrices;
|
||||
cmp_deeply(
|
||||
$response->{ shipping },
|
||||
[ qw{ a b c } ],
|
||||
'shipping contains available shipping option when no shipper is passed',
|
||||
);
|
||||
is( $cart->get('shippingAddressId'), $address->getId, 'calling www_ajaxPrices w/o shipperId doesn\'t change the cart shipperId' );
|
||||
|
||||
local *WebGUI::Session::Form::get = sub { return 'OtherShippert' };
|
||||
$response = from_json $cart->www_ajaxPrices;
|
||||
cmp_deeply(
|
||||
$response->{ shipping },
|
||||
[ qw{ a b c } ],
|
||||
'shipping contains available shipping option when a shipper is passed',
|
||||
);
|
||||
is( $cart->get('shippingAddressId'), 'OtherShippert', 'calling www_ajaxPrices w/ shipperId updates the cart shipperId' );
|
||||
|
||||
$cart->update( { shippingAddressId => $shipper->getId } );
|
||||
}
|
||||
|
||||
# Test (part of) www_view
|
||||
{
|
||||
my $shippingAddressId = $cart->get( 'shippingAddressId' );
|
||||
my $billingAddressId = $cart->get( 'billingAddressId' );
|
||||
|
||||
$cart->update( { shippingAddressId => 'NoWayDude' } );
|
||||
eval { $cart->www_view };
|
||||
is( $@, '', 'Invalid shippingAddressId doesn\'t make www_view crash' );
|
||||
|
||||
$cart->update( { billingAddressId => 'WRONG!!!!', shippingAddressId => $shippingAddressId } );
|
||||
eval { $cart->www_view };
|
||||
is( $@, '', 'Invalid billingAddressId doesn\'t make www_view crash' );
|
||||
|
||||
$cart->update( { billingAddressId => $billingAddressId } );
|
||||
}
|
||||
|
||||
$product->purge;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue