[Rt-commit] r7547 - in rt/branches/3.6-RELEASE: . lib/t/regression

[falcone at bestpractical.com]

Author: falcone
Date: Wed Apr 18 17:10:45 2007
New Revision: 7547

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/REST/1.0/ticket/link
   rt/branches/3.6-RELEASE/lib/t/regression/26command_line.t

Log:
 r18127 at ketch:  falcone | 2007-04-18 17:08:59 -0400
 * make bin/rt link work and fix the associated tests


Modified: rt/branches/3.6-RELEASE/html/REST/1.0/ticket/link
==============================================================================
--- rt/branches/3.6-RELEASE/html/REST/1.0/ticket/link	(original)
+++ rt/branches/3.6-RELEASE/html/REST/1.0/ticket/link	Wed Apr 18 17:10:45 2007
@@ -72,7 +72,7 @@
 
 # http://.../REST/1.0/ticket/link/1
 
-$object =~ s#^/##;
+$object =~ s#^/REST/1.0/ticket/link##;
 if ($id && $object && $id != $object) {
     $output = "Different ids in URL (`$object') and submitted form (`$id').\n";
     $status = "400 Bad Request";
@@ -109,6 +109,9 @@
 ($n, $output) = $ticket->$op(Type => $type, $mode => $to);
 if ($n == 0) {
     $status = "500 Error";
+} else {
+    my $action = $del ? "Deleted" : "Created";
+    $output .= " $action link " . $ticket->Id . " $rel $to";
 }
 
 OUTPUT:

Modified: rt/branches/3.6-RELEASE/lib/t/regression/26command_line.t
==============================================================================
--- rt/branches/3.6-RELEASE/lib/t/regression/26command_line.t	(original)
+++ rt/branches/3.6-RELEASE/lib/t/regression/26command_line.t	Wed Apr 18 17:10:45 2007
@@ -354,12 +354,10 @@
 # }}}
 
 # {{{ test ticket linking
-
-TODO: {
-    todo_skip "Linking doesn't work yet", 54;
-
     my @link_relns = ( 'DependsOn', 'DependedOnBy', 'RefersTo', 'ReferredToBy',
                        'MemberOf', 'HasMember', );
+    my %display_relns = map { $_ => $_ } @link_relns;
+    $display_relns{HasMember} = 'Members';
 
     my $link1_id = ok_create_ticket( "LinkTicket1-$$" );
     my $link2_id = ok_create_ticket( "LinkTicket2-$$" );
@@ -369,17 +367,16 @@
         expect_send("link $link1_id $reln $link2_id", "Link by $reln...");
         expect_like(qr/Created link $link1_id $reln $link2_id/, 'Linked');
         expect_send("show ticket/$link1_id/links", "Checking creation of $reln...");
-        expect_like(qr/$reln: [\w\d\.]+:\/\/[\w\d\.]+\/ticket\/$link2_id/, "Created link $reln");
+        expect_like(qr/$display_relns{reln}: [\w\d\.\-]+:\/\/[\w\d\.]+\/ticket\/$link2_id/, "Created link $reln");
 
         # delete link
-        expect_send("link $link1_id $reln $link2_id", "Delete $reln...");
-        expect_like(qr/Created link $link1_id $reln $link2_id/, 'Deleted');
+        expect_send("link -d $link1_id $reln $link2_id", "Delete $reln...");
+        expect_like(qr/Deleted link $link1_id $reln $link2_id/, 'Deleted');
         expect_send("show ticket/$link1_id/links", "Checking removal of $reln...");
-        ok( expect_handle->before() !~ /\Q$reln: \E[\w\d\.]+:\/\/[w\d\.]+\/ticket\/$link2_id/, "Removed link $reln" );
+        ok( expect_handle->before() !~ /\Q$display_relns{$reln}: \E[\w\d\.\-]+:\/\/[w\d\.]+\/ticket\/$link2_id/, "Removed link $reln" );
         #expect_unlike(qr/\Q$reln: \E[\w\d\.]+\Q://\E[w\d\.]+\/ticket\/$link2_id/, "Removed link $reln");
 
     }
-}
 # }}}