[Rt-commit] r19902 - in rtir/2.5/trunk: t/lib/RT/IR

[ruz at bestpractical.com]

Author: ruz
Date: Thu Jun  4 11:52:39 2009
New Revision: 19902

Modified:
   rtir/2.5/trunk/   (props changed)
   rtir/2.5/trunk/t/lib/RT/IR/Test.pm

Log:
* sync 2.4->2.5
 r19916 at Macintosh (orig r19901):  ruz | 2009-06-04 19:52:02 +0300
 * call diag properly as it's not imported


Modified: rtir/2.5/trunk/t/lib/RT/IR/Test.pm
==============================================================================
--- rtir/2.5/trunk/t/lib/RT/IR/Test.pm	(original)
+++ rtir/2.5/trunk/t/lib/RT/IR/Test.pm	Thu Jun  4 11:52:39 2009
@@ -187,7 +187,6 @@
     display_ticket( $agent, $id );
     foreach my $inc( @$incs ) {
         my $desc = shift || "Ticket #$id is not linked to the Incident #$inc";
-        diag $agent->content;
         $agent->content_unlike(
             qr{Incident:\s*</td>\s*<td[^>]*?>.*?<a\s+href="/RTIR/Display.html\?id=\Q$inc\E">\Q$inc\E:\s+}ism,
             $desc
@@ -297,7 +296,7 @@
         $id = $1;
     }
     elsif ($content =~ /.*No permission to view newly created ticket #(\d+).*/g) {
-        diag("\nNo permissions to view the ticket.\n") if($ENV{'TEST_VERBOSE'});
+        Test::More::diag("\nNo permissions to view the ticket.\n") if($ENV{'TEST_VERBOSE'});
         $id = $1;
     }
     return $id;
@@ -404,9 +403,9 @@
         my $max = pop @ids;
         my $url = "Merge.html?id=$id&Order=ASC&Query=( 'CF.{State}' = 'new' OR 'CF.{State}' = 'open' AND 'id' > $max)";
         my $weburl = RT->Config->Get('WebURL');
-        diag("IDs found: " . join ', ', @ids);
-        diag("Max ID: " . $max);
-        diag ("URL: " . $url);
+        Test::More::diag("IDs found: " . join ', ', @ids);
+        Test::More::diag("Max ID: " . $max);
+        Test::More::diag ("URL: " . $url);
         $agent->get("$weburl/RTIR/$url");
         last unless $agent->content() =~ qr|<b>\s*<a href="/Ticket/Display.html?id=(\d+)">\1</a>\s*</b>|sm;
     }