fix bugs revealed by Test::Class tests

t/tests/Test/WebGUI/Asset.pm

@@ -20,6 +20,10 @@ use Test::Exception;
 use WebGUI::Test;
 use Data::Dumper;
 use List::MoreUtils;
+use WebGUI::Test::Mechanize;
+
+use UNIVERSAL::isa;
+no warnings 'UNIVERSAL::isa';
 
 # XXXX fix the Test(n) numbers to match reality
 
@@ -109,16 +113,25 @@ sub getAnchoredAsset {
         status  => "pending",
         tagId   => $tag->getId,
         $test->constructorExtras($session),
-    }, undef, undef, {skipNotification => 1});
+    }, undef, (time-10), {skipNotification => 1});
     # warn "XXX getAnchoredAsset:  created new asset of Id: " . $asset->getId . ' of type: ' . ref $asset;
     $tag->commit;
     foreach my $a ($asset, @parents) {
         $a = $a->cloneFromDb;
     }
     WebGUI::Test->addToCleanup($tag);
+    $test->{_currentTag} = $tag;
     return ($tag, $asset, @parents);
 }
 
+sub deleteAssets : Test(teardown) {
+    my ( $test ) = shift;
+    if ( $test->{_currentTag} ) {
+        $test->{_currentTag}->rollback;
+        delete $test->{_currentTag};
+    }
+}
+
 sub getMyParents {
     my $test           = shift;
     my $session        = $test->session;
@@ -127,17 +140,17 @@ sub getMyParents {
     my $default        = WebGUI::Asset->getDefault($session);
     push @parents, $default;
     my $parent = $default;
-    my $tag     = WebGUI::VersionTag->getWorking($session);
+    my $tag = WebGUI::VersionTag->getWorking( $session );
     foreach my $parent_class (@{ $parent_classes }) {
         my $new_parent = $parent->addChild(
             {   
                 className => $parent_class, 
-                status => "pending", 
-                tagId => $tag->getId,
                 $test->constructorExtras($session), 
+                status  => 'pending',
+                tagId   => $tag->getId,
             }, 
             undef, 
-            undef, 
+            (time-10), 
             {skipNotification => 1,},
         );
         push @parents, $new_parent;
@@ -564,8 +577,6 @@ sub t_20_www_editSave : Tests {
     $asset->groupIdEdit( 7 ); # Everybody! Everybody!
 
     $asset->commit;
-    $tag->setWorking;
-    sleep 2; # XXXX Todo -- investigate whether this is actually fixing duplicate commit problems
 
     my %mergedProperties = (   
         formProperties($asset),  
@@ -577,15 +588,28 @@ sub t_20_www_editSave : Tests {
     # local $SIG{__DIE__} = sub { use Carp; Carp::confess "@_"; };
     # local $SIG{__DIE__} = sub { use wth; wth::wth "@_"; };  # see note above about wth
 
-    $session->request->setup_body( \%mergedProperties );
+    my $mech    = WebGUI::Test::Mechanize->new( config => WebGUI::Test->file );
+    $mech->get('/');
+    $mech->session->user({ userId => 3 });
+    $tag = WebGUI::VersionTag->getWorking( $mech->session );
+    $tag->setWorking;
+    $mech->get_ok( $asset->getUrl('func=edit') );
 
-    my $content;
-    ok(eval { $asset->www_editSave; }, 'www_editSave returns true');
-    debug($@);
-    undef $@;
+    my $form_content = $mech->content;
+    if ( $test->isa( 'Test::WebGUI::Asset::File::GalleryFile::Photo' )
+        || $test->isa( 'Test::WebGUI::Asset::Wobject::GalleryAlbum' )
+        || $test->isa( 'Test::WebGUI::Asset::Event' )
+    ) {
+        $session->log->info( $form_content );
+    }
+    $mech->submit_form_ok( {
+            fields  => \%mergedProperties,
+        },
+        "submit www_editSave form"
+    );
 
     # Get the newly-created revision of the asset
-    ok( my $newRevision = eval { WebGUI::Asset->newPending( $session, $asset->getId ); }, 'newPending returns true' );
+    ok( my $newRevision = eval { WebGUI::Asset->newPending( $mech->session, $asset->getId ); }, 'newPending returns true' );
     debug($@);
     undef $@;
 

t/tests/Test/WebGUI/Asset/Event.pm

@@ -24,4 +24,10 @@ sub parent_list {
     return ['WebGUI::Asset::Wobject::Calendar'];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{startDate} = "2010-01-01";
+    $props->{endDate} = "2010-01-02";
+}
+
 1;

t/tests/Test/WebGUI/Asset/Post.pm

@@ -25,4 +25,9 @@ sub parent_list {
     return [ map { "WebGUI::Asset::$_"} qw/Wobject::Collaboration Post::Thread/ ];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{func} = "editSave"; # func defaults to preview mode
+}
+
 1;

t/tests/Test/WebGUI/Asset/Snippet.pm

@@ -25,4 +25,9 @@ sub list_of_tables {
      return [qw/assetData snippet/];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{snippet} = "some text";
+}
+
 1;

t/tests/Test/WebGUI/Asset/Wobject/Carousel.pm

@@ -21,4 +21,17 @@ sub list_of_tables {
      return [qw/assetData wobject Carousel/];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{something} = JSON->new->encode({
+        items   => [
+            {
+                sequenceNumber => 1,
+                text => "Item 1",
+            },
+        ],
+    });
+    return $props;
+}
+
 1;

t/tests/Test/WebGUI/Asset/Wobject/GalleryAlbum.pm

@@ -25,4 +25,9 @@ sub parent_list {
     return [qw/WebGUI::Asset::Wobject::Gallery/];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{save} = "save"; # GalleryAlbum www_edit checks for this to go to editSave
+}
+
 1;

t/tests/Test/WebGUI/Asset/Wobject/SQLReport.pm

@@ -25,4 +25,9 @@ sub list_of_tables {
      return [qw/assetData wobject SQLReport/];
 }
 
+sub postProcessMergedProperties {
+    my ( $test, $props ) = @_;
+    $props->{dbQuery1} = "SELECT * FROM users";
+}
+
 1;