[Bps-public-commit] r14967 - in sd/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Sat Aug  9 18:52:45 2008
New Revision: 14967

Modified:
   sd/trunk/   (props changed)
   sd/trunk/t/01-create.t
   sd/trunk/t/sd-attachments.t
   sd/trunk/t/sd-comments.t

Log:
 r69049 at onn:  sartak | 2008-08-09 18:52:39 -0400
 Test fixes. t/hm.t t/rt.t still fail, looks like it's not pulling properly


Modified: sd/trunk/t/01-create.t
==============================================================================
--- sd/trunk/t/01-create.t	(original)
+++ sd/trunk/t/01-create.t	Sat Aug  9 18:52:45 2008
@@ -24,13 +24,13 @@
    
 );
 
-run_output_matches( 'sd', [ 'ticket',  
-    'show', '--id', $yatta_id ],
+run_output_matches( 'sd', [ 'ticket', 'show', '--batch', '--id', $yatta_id ],
     [
-        qr/id:\s+$yatta_id\s+\($yatta_uuid\)/,
-        qr/summary:\s+YATTA/,
-        qr/status:.+new/,
-        qr/created:\s+\d{4}-\d{2}-\d{2}.+/,
+        "id: $yatta_id ($yatta_uuid)",
+        'summary: YATTA',
+        'status: new',
+        qr/^created: \d{4}-\d{2}-\d{2}.+$/,
+        qr/^creator: .+ at .+$/,
     ]
 );
 

Modified: sd/trunk/t/sd-attachments.t
==============================================================================
--- sd/trunk/t/sd-attachments.t	(original)
+++ sd/trunk/t/sd-attachments.t	Sat Aug  9 18:52:45 2008
@@ -29,13 +29,13 @@
     'sd',
     [ qw/ticket attachment show --batch --id/, $attachment_id ],
     [ 
-    
         qr/id: $attachment_id \($attachment_uuid\)/, 
-        qr/created:\s+\d{4}-\d{2}-\d{2}.+/,
+        "content: stub",
         "content_type: text/plain",
+        qr/created: \d{4}-\d{2}-\d{2}.+/,
+        qr/creator: .+ at .+$/,
         qr/paper_order.doc/,
-        "content: stub",
-        "ticket: $yatta_uuid"
+        "ticket: $yatta_uuid",
     ],
     [],
     "Found the attachment"
@@ -55,10 +55,11 @@
     [ qw/ticket attachment show --batch --uuid/, $attachment_uuid ],
     [  
         qr/id: (\d+) \($attachment_uuid\)/, 
-        qr/created:\s+\d{4}-\d{2}-\d{2}.+/,
+        "content: stub",
         "content_type: text/plain",
+        qr/created: \d{4}-\d{2}-\d{2}.+/,
+        qr/creator: .+ at .+$/,
         qr/plague_recipe.doc/,
-        "content: stub",
         "ticket: $yatta_uuid"
     ],
     [],

Modified: sd/trunk/t/sd-comments.t
==============================================================================
--- sd/trunk/t/sd-comments.t	(original)
+++ sd/trunk/t/sd-comments.t	Sat Aug  9 18:52:45 2008
@@ -34,8 +34,9 @@
     'sd',
     [ qw/ticket comment show --batch --uuid/, $comment_uuid ],
     [   qr/id: (\d+) \($comment_uuid\)/,
-        qr/created: /i,
         qr/This is a test/,
+        qr/created: /,
+        qr/creator: /,
         "ticket: $yatta_uuid"
     ],
     [],
@@ -55,8 +56,11 @@
     'sd',
     [ qw/ticket comment show --batch --uuid/, $comment_uuid ],
     [ qr/id: (\d+) \($comment_uuid\)/, 
+        qr/I hate you/,
         qr/created: /i,
-    qr/I hate you/, "ticket: $yatta_uuid" ],
+        qr/creator: /i,
+        "ticket: $yatta_uuid"
+    ],
     [],
     "Found the comment new version"
 );