From d40fbc8255219aa3f78ce4fc4723cade6524748b Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Thu, 14 Oct 2010 18:02:36 -0500 Subject: [PATCH] fix Cut assethelper tests --- t/AssetHelper/Cut.t | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/t/AssetHelper/Cut.t b/t/AssetHelper/Cut.t index 251c563e5..d13c9f720 100644 --- a/t/AssetHelper/Cut.t +++ b/t/AssetHelper/Cut.t @@ -20,6 +20,7 @@ use WebGUI::Test; # Must use this before any other WebGUI modules use WebGUI::Session; use WebGUI::Asset; use WebGUI::AssetHelper::Cut; +use WebGUI::Test::Mechanize; #---------------------------------------------------------------------------- # Init @@ -30,10 +31,10 @@ my $session = WebGUI::Test->session; # Tests my $output; -my $home = WebGUI::Asset->getDefault($session); +my $import = WebGUI::Asset->getImportNode($session); $session->user({userId => 1}); -$output = WebGUI::AssetHelper::Cut->process($home); +$output = WebGUI::AssetHelper::Cut->process($import); cmp_deeply( $output, { @@ -43,7 +44,7 @@ cmp_deeply( ); $session->user({userId => 3}); -$output = WebGUI::AssetHelper::Cut->process($home); +$output = WebGUI::AssetHelper::Cut->process($import); cmp_deeply( $output, { @@ -52,20 +53,26 @@ cmp_deeply( 'AssetHelper/Cut checks for system pages' ); -my $safe_page = $home->getFirstChild; +my $safe_page = $import->getFirstChild; $output = WebGUI::AssetHelper::Cut->process($safe_page); cmp_deeply( $output, { - message => re('was cut to the clipboard'), - redirect => $home->getUrl, + openDialog => all( re('method=cut'), re('assetId=' . $safe_page->getId) ), }, - 'AssetHelper/Cut returns a message and a redirect' + 'AssetHelper/Cut opens a dialog' ); + +my $mech = WebGUI::Test::Mechanize->new( config => WebGUI::Test->file ); +$mech->get_ok( $output->{ openDialog } ); +$mech->content_lacks( 'error', "Cut succeeded" ); + +$session->cache->clear; +$safe_page = WebGUI::Asset->newById( $session, $safe_page->assetId ); is $safe_page->state, 'clipboard', '... and the asset was really cut'; -$session->asset($home); -ok $home->paste($safe_page->getId), 'page pasted correctly'; +$session->asset($import); +ok $import->paste($safe_page->getId), 'page pasted correctly'; $session->cache->clear; my $safe_page2 = WebGUI::Asset->newById($session, $safe_page->assetId);