starting to work...

[freeside.git] / rt / t / approval / admincc.t

diff --git a/rt/t/approval/admincc.t b/rt/t/approval/admincc.t
index 7915b6a..b439296 100644 (file)
--- a/rt/t/approval/admincc.t
+++ b/rt/t/approval/admincc.t
@@ -9,7 +9,7 @@ BEGIN {
 
 
 use RT;
-use RT::Test tests => 58;
+use RT::Test tests => 62;
 use RT::Test::Email;
 
 RT->Config->Set( LogToScreen => 'debug' );
@@ -236,14 +236,18 @@ $m->get_ok( $approval_link );
 $m_coo->get_ok( $approval_link );
 $m_ceo->get_ok( $approval_link );
 
-$m->content_like( qr/first approval.*second approval/s, 'cto: see both approvals' );
-$m_coo->content_like( qr/first approval.*second approval/s, 'coo: see both approvals' );
-$m_ceo->content_like( qr/first approval.*second approval/s, 'ceo: see both approvals' );
+$m->content_contains('first approval',  'cto: see both approvals' );
+$m->content_contains('second approval', 'cto: see both approvals' );
+
+$m_coo->content_contains('first approval',  'coo: see both approvals');
+$m_coo->content_contains('second approval', 'coo: see both approvals');
+
+$m_ceo->content_contains('first approval',  'ceo: see both approvals');
+$m_ceo->content_contains('second approval', 'ceo: see both approvals');
 
 # now let's approve the first one via cto
-$m->content_like( qr/first approval.*second approval/s, 'cto can see both approvals' );
 $m->submit_form(
-    form_number => 3,
+    form_name   => 'Approvals',
     fields      => { 'Approval-' . $first_approval->id . '-Action' => 'approve', },
 );
 
@@ -257,7 +261,7 @@ $m_ceo->content_lacks( 'first approval', 'ceo: first approval is gone' );
 $m_ceo->content_contains( 'second approval', 'ceo: second approval is still here' );
 
 $m_coo->submit_form(
-    form_number => 3,
+    form_name => 'Approvals',
     fields      => { 'Approval-' . $second_approval->id . '-Action' => 'approve', },
 );