Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / rt / t / api / rights_show_ticket.t

diff --git a/rt/t/api/rights_show_ticket.t b/rt/t/api/rights_show_ticket.t
index 3e1d074..b7bec70 100644 (file)
--- a/rt/t/api/rights_show_ticket.t
+++ b/rt/t/api/rights_show_ticket.t
@@ -1,6 +1,5 @@
-#!/usr/bin/perl -w
 
-use RT::Test tests => 264;
+use RT::Test nodata => 1, tests => 264;
 
 use strict;
 use warnings;
@@ -208,7 +207,6 @@ diag "Testing with UseSQLForACLChecks => $option";
 }
 
 sub have_no_rights {
-    $SIG{'INT'} = $SIG{'TERM'} = sub { print STDERR Carp::longmess('boo'); exit 1 };
     local $Test::Builder::Level = $Test::Builder::Level + 1;
     foreach my $u ( @_ ) {
         foreach my $q (
@@ -228,7 +226,7 @@ sub create_tickets_set{
     my @res;
     foreach my $q ($queue_a, $queue_b) {
         foreach my $n (1 .. 2) {
-            my $ticket = RT::Ticket->new( $RT::SystemUser );
+            my $ticket = RT::Ticket->new( RT->SystemUser );
             my ($tid) = $ticket->Create(
                 Queue => $q->id, Subject => $q->Name .' - '. $n
             );
@@ -239,24 +237,8 @@ sub create_tickets_set{
     return @res;
 }
 
-sub cleanup { delete_tickets(); delete_watchers() }; 
-
-sub delete_tickets {
-    my $tickets = RT::Tickets->new( $RT::SystemUser );
-    $tickets->FromSQL( "Queue = $qa_id OR Queue = $qb_id" );
-    while ( my $ticket = $tickets->Next ) {
-        $ticket->Delete;
-    }
-}
-
-sub delete_watchers {
-    foreach my $q ($queue_a, $queue_b) {
-        foreach my $u ($user_a, $user_b) {
-            foreach my $t (qw(Cc AdminCc) ) {
-                $q->DeleteWatcher( Type => $t, PrincipalId => $u->id )
-                    if $q->IsWatcher( Type => $t, PrincipalId => $u->id );
-            }
-        }
-    }
-}
+sub cleanup {
+    RT::Test->delete_tickets( "Queue = $qa_id OR Queue = $qb_id" );
+    RT::Test->delete_queue_watchers( $queue_a, $queue_b );
+};