[Rt-commit] r8231 - in rtir/branches/2.3-EXPERIMENTAL: .

[thayes at bestpractical.com]

Author: thayes
Date: Thu Jul 19 14:29:59 2007
New Revision: 8231

Modified:
   rtir/branches/2.3-EXPERIMENTAL/   (props changed)
   rtir/branches/2.3-EXPERIMENTAL/t/011-merge.t

Log:
 r8343 at toth:  toth | 2007-07-19 14:29:16 -0400
 
 
 * Fixed merge test
 


Modified: rtir/branches/2.3-EXPERIMENTAL/t/011-merge.t
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/t/011-merge.t	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/t/011-merge.t	Thu Jul 19 14:29:59 2007
@@ -22,10 +22,12 @@
     ok_and_content_like($agent, qr{Merge Successful}, 'Merge Successful');
 
     display_ticket($agent, $ir1_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Opened the merged ticket');
-
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Opened the merged ticket');
+	#diag("Content:\n\n" . $agent->content());
     display_ticket($agent, $ir2_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Second id points to the ticket we merged into');
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Second id points to the ticket we merged into');
+    #diag("Content:\n\n" . $agent->content());
+
 }
 
 { # merge an IR into a linked IR, the product should have open state
@@ -46,10 +48,10 @@
     ok_and_content_like($agent, qr{Merge Successful}, 'Merge Successful');
 
     display_ticket($agent, $ir1_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Opened the merged ticket');
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Opened the merged ticket');
 
     display_ticket($agent, $ir2_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Second id points to the ticket we merged into');
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Second id points to the ticket we merged into');
 
     ticket_state_is( $agent, $ir2_id, 'open' );
 }
@@ -73,10 +75,10 @@
     ok_and_content_like($agent, qr{Merge Successful}, 'Merge Successful');
 
     display_ticket($agent, $ir2_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Second id points to the ticket we merged into');
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Second id points to the ticket we merged into');
 
     display_ticket($agent, $ir1_id);
-    ok_and_content_like($agent, qr{Incident Report #$ir2_id:}, 'Opened the merged ticket');
+    ok_and_content_like($agent, qr{Incident Report #$ir1_id:}, 'Opened the merged ticket');
     ticket_state_is( $agent, $ir1_id, 'open' );
 }