Merge commit '17ce3572bf' into WebGUI8. All tests passing.

t/Shop/Cart.t

@@ -154,8 +154,8 @@ is( $cart->readyForCheckout, 0, 'Cannot checkout an empty cart' );
 is($session->db->quickScalar("select count(*) from cartItem where cartId=?",[ $cart->getId ]), 0, "Items are removed from cart.");
 
 
-my $session2 = WebGUI::Session->open(WebGUI::Test->file);
-addToCleanup($session2);
+my $session2 = WebGUI::Test->newSession;
+WebGUI::Test->addToCleanup($session2);
 $session2->user({userId => 3});
 my $cart2 = WebGUI::Shop::Cart->newBySession($session2);
 WebGUI::Test->addToCleanup($cart2);

t/Shop/Pay.t

@@ -109,6 +109,7 @@ my $options = {
     label   => 'Cold, stone hard cash',
 };
 $newDriver = $pay->addPaymentGateway('WebGUI::Shop::PayDriver::Cash', $options);
+WebGUI::Test->addToCleanup($newDriver);
 isa_ok($newDriver, 'WebGUI::Shop::PayDriver::Cash', 'added a new, configured Cash driver');
 is($newDriver->get('label'), 'Cold, stone hard cash', 'label passed correctly to paydriver');
 
@@ -189,6 +190,7 @@ my $otherOptions = {
     label       => 'Even harder cash',
 };
 $anotherDriver = $pay->addPaymentGateway('WebGUI::Shop::PayDriver::Cash', $otherOptions);
+WebGUI::Test->addToCleanup($anotherDriver);
 
 my $gateways = $pay->getPaymentGateways;
 my @returnedIds = map {$_->get('label')} @{ $gateways };
@@ -215,10 +217,3 @@ cmp_bag(
 #######################################################################
 
 done_testing();
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    defined $newDriver and $newDriver->delete;
-    defined $newDriver and $anotherDriver->delete;
-}

t/Shop/PayDriver/PayPalStd.t

@@ -41,12 +41,6 @@ my $e;
 
 my $loaded = use_ok('WebGUI::Shop::PayDriver::PayPal::PayPalStd');
 
-my $storage;
-
-SKIP: {
-
-skip 'Unable to load module WebGUI::Shop::PayDriver::PayPal::PayPalStd', $tests unless $loaded;
-
 #######################################################################
 #
 # getName
@@ -77,5 +71,4 @@ $driver->delete;
 
 undef $driver;
 
-}
-
+#vim:ft=perl

t/Shop/Ship.t

@@ -40,7 +40,6 @@ my $session         = WebGUI::Test->session;
 my $loaded = use_ok('WebGUI::Shop::Ship');
 
 my $storage;
-my $driver;
 my $driver2;
 my $ship;
 
@@ -136,7 +135,8 @@ cmp_deeply(
     'addShipper croaks without options to build a object with',
 );
 
-$driver = $ship->addShipper('WebGUI::Shop::ShipDriver::FlatRate', { enabled=>1, label=>q{Jake's Jailbird Airmail}, groupToUse=>7});
+my $driver = $ship->addShipper('WebGUI::Shop::ShipDriver::FlatRate', { enabled=>1, label=>q{Jake's Jailbird Airmail}, groupToUse=>7});
+WebGUI::Test->addToCleanup($driver);
 isa_ok($driver, 'WebGUI::Shop::ShipDriver::FlatRate', 'added a new, configured FlatRate driver');
 
 #######################################################################
@@ -146,7 +146,8 @@ isa_ok($driver, 'WebGUI::Shop::ShipDriver::FlatRate', 'added a new, configured F
 #######################################################################
 
 my $shippers;
-$driver2 = $ship->addShipper('WebGUI::Shop::ShipDriver::FlatRate', { enabled=>0, label=>q{Tommy's cut-rate shipping}, groupToUse=>7});
+my $driver2 = $ship->addShipper('WebGUI::Shop::ShipDriver::FlatRate', { enabled=>0, label=>q{Tommy's cut-rate shipping}, groupToUse=>7});
+WebGUI::Test->addToCleanup($driver2);
 
 $shippers = $ship->getShippers();
 
@@ -204,9 +205,4 @@ $cart->delete;
 
 done_testing();
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $driver->delete;
-    $driver2->delete;
-}
+#vim:ft=perl

t/Shop/ShipDriver.t

@@ -43,10 +43,6 @@ my $loaded = use_ok('WebGUI::Shop::ShipDriver');
 
 my $storage;
 
-SKIP: {
-
-skip 'Unable to load module WebGUI::Shop::ShipDriver', $tests unless $loaded;
-
 #######################################################################
 #
 # definition
@@ -163,6 +159,7 @@ my $options = {
               };
 
 $driver = WebGUI::Shop::ShipDriver->create( $session, $options );
+WebGUI::Test->addToCleanup($driver);
 
 isa_ok($driver, 'WebGUI::Shop::ShipDriver');
 
@@ -399,5 +396,3 @@ is($count, 0, 'delete deleted the object');
 
 undef $driver;
 
-
-}

t/Shop/TaxDriver/Generic.t

@@ -41,6 +41,8 @@ my $addExceptions = getAddExceptions($session);
 plan tests => 79
             +  2*scalar(@{$addExceptions});
 
+WebGUI::Test->addToCleanup(SQL => 'delete from tax_generic_rates');
+
 #----------------------------------------------------------------------------
 # put your tests here
 
@@ -666,9 +668,4 @@ sub getAddExceptions {
         },
     ];
 }
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $session->db->write('delete from tax_generic_rates');
-}
+#vim:ft=perl

t/Shop/Transaction.t

@@ -267,6 +267,7 @@ $templateMock->mock('process', sub { push @templateVars, clone $_[1]; } );
 $session->setting->set('shopReceiptEmailTemplateId', $templateId);
 
 {
+    WebGUI::Test->addToCleanup(sub { WebGUI::Test->cleanupAdminInbox(); });
     $trans->sendNotifications;
     is(@templateVars, 2, '... called template->process twice');
     my $inbox = WebGUI::Inbox->new($session);

t/Shop/Vendor.t

@@ -31,8 +31,7 @@ my $session         = WebGUI::Test->session;
 #----------------------------------------------------------------------------
 # Tests
 
-my $tests = 49;
-plan tests => 1 + $tests;
+plan tests => 49;
 
 #----------------------------------------------------------------------------
 # put your tests here
@@ -47,10 +46,6 @@ my $guardUser = WebGUI::User->new($session, 'new');
 $guardUser->username('guard');
 WebGUI::Test->addToCleanup($fenceUser, $guardUser);
 
-SKIP: {
-
-skip 'Unable to load module WebGUI::Shop::Vendor', $tests unless $loaded;
-
 $numberOfVendors = scalar @{ WebGUI::Shop::Vendor->getVendors($session) };
 
 #######################################################################
@@ -130,6 +125,7 @@ cmp_deeply(
 my $now = WebGUI::DateTime->new($session, time);
 
 eval { $fence = WebGUI::Shop::Vendor->create($session, { userId => $fenceUser->userId, }); };
+WebGUI::Test->addToCleanup($fence);
 $e = Exception::Class->caught();
 ok(!$e, 'No exception thrown by create');
 isa_ok($vendor, 'WebGUI::Shop::Vendor', 'create returns correct type of object');
@@ -251,6 +247,7 @@ my $defaultVendor = WebGUI::Shop::Vendor->newByUserId($session, 3);
 #######################################################################
 
 $guard = WebGUI::Shop::Vendor->create($session, { userId => $guardUser->userId, name => q|Warden Norton|});
+WebGUI::Test->addToCleanup($guard);
 my $vendorsList = WebGUI::Shop::Vendor->getVendors($session);
 cmp_deeply(
     $vendorsList,
@@ -307,11 +304,4 @@ foreach (keys %completeProps ) {
 
 undef $guard;
 
-}
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $fence->delete;
-    is( scalar @{  WebGUI::Shop::Vendor->getVendors($session) }, $numberOfVendors, 'No vendors leaked');
-}
+#vim:ft=perl