[Rt-commit] r18825 - in rt/3.999/branches/lorzy: lib/RT/Model

[clkao at bestpractical.com]

Author: clkao
Date: Tue Mar 17 10:29:00 2009
New Revision: 18825

Modified:
   rt/3.999/branches/lorzy/lib/RT/Model/Ticket.pm
   rt/3.999/branches/lorzy/t/approval/basic.t

Log:
just enough transaction_obj changes.

Modified: rt/3.999/branches/lorzy/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/3.999/branches/lorzy/lib/RT/Model/Ticket.pm	(original)
+++ rt/3.999/branches/lorzy/lib/RT/Model/Ticket.pm	Tue Mar 17 10:29:00 2009
@@ -2251,7 +2251,7 @@
     my $rules = RT::Ruleset->find_all_rules(
         stage           => 'transaction_batch',
         ticket_obj      => $ticket,
-        transaction     => $batch->[0],
+        transaction_obj => $batch->[0],
         type            => join( ',', map $_->type, grep defined, @{$batch} )
     );
     RT::Ruleset->commit_rules($rules);

Modified: rt/3.999/branches/lorzy/t/approval/basic.t
==============================================================================
--- rt/3.999/branches/lorzy/t/approval/basic.t	(original)
+++ rt/3.999/branches/lorzy/t/approval/basic.t	Tue Mar 17 10:29:00 2009
@@ -8,7 +8,7 @@
         or plan skip_all => 'require Email::Abstract and Test::Email';
 }
 
-plan tests => 37;
+plan tests => 32;
 
 use RT;
 use RT::Test;
@@ -87,14 +87,14 @@
         $t->create(subject => "PO for stationary",
                    owner => "root", requestor => $users{minion}->email,
                    queue => $q->id);
-} { from => qr/RT System/,
-    to => 'cfo at company.com',
-    subject => qr/New Pending Approval: CFO Approval/,
-    body => qr/pending your approval.*Your approval is requested.*Blah/s
-},{ from => qr/PO via RT/,
+} { from => qr/PO via RT/,
     to => 'minion at company.com',
     subject => qr/PO for stationary/,
     body => qr/automatically generated in response/
+},{ from => qr/RT System/,
+    to => 'cfo at company.com',
+    subject => qr/New Pending Approval: CFO Approval/,
+    body => qr/pending your approval.*Your approval is requested.*Blah/s
 };
 
 ok ($tid,$tmsg);