[Bps-public-commit] r14965 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Sat Aug  9 17:52:30 2008
New Revision: 14965

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/t/publish-pull.t
   Prophet/trunk/t/simple-conflicting-merge.t
   Prophet/trunk/t/simple-push.t

Log:
 r69042 at onn:  sartak | 2008-08-09 17:51:38 -0400
 Fix up the rest of the tests


Modified: Prophet/trunk/t/publish-pull.t
==============================================================================
--- Prophet/trunk/t/publish-pull.t	(original)
+++ Prophet/trunk/t/publish-pull.t	Sat Aug  9 17:52:30 2008
@@ -117,6 +117,10 @@
                     old_value => undef,
                     new_value => 'alice',
                 },
+                creator => {
+                    old_value => undef,
+                    new_value => 'alice@' . replica_uuid_for('alice'),
+                },
             },
         },
     };

Modified: Prophet/trunk/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/simple-conflicting-merge.t	(original)
+++ Prophet/trunk/t/simple-conflicting-merge.t	Sat Aug  9 17:52:30 2008
@@ -31,11 +31,12 @@
     run_ok( 'prophet', [ 'update', '--type', 'Bug', '--uuid', $record_id, '--', '--status' => 'stalled' ] );
     run_output_matches(
         'prophet',
-        [ 'show','--type', 'Bug', '--uuid', $record_id ],
+        [ 'show', '--batch', '--type', 'Bug', '--uuid', $record_id ],
         [
-            qr/id:     (\d+) \($record_id\)/,
+            qr/id: (\d+) \($record_id\)/,
+              'creator: alice@' . replica_uuid_for('alice'),
+              'from: alice',
               'status: stalled',
-              'from:   alice',
         ],
         'content is correct'
     );
@@ -48,8 +49,9 @@
         ['show', '--type', 'Bug', '--uuid', $record_id, '--batch', ],
         [
             qr/id: (\d+) \($record_id\)/,
-              'status: stalled',
+              'creator: alice@' . replica_uuid_for('alice'),
               'from: alice',
+              'status: stalled',
         ],
         'content is correct'
     );

Modified: Prophet/trunk/t/simple-push.t
==============================================================================
--- Prophet/trunk/t/simple-push.t	(original)
+++ Prophet/trunk/t/simple-push.t	Sat Aug  9 17:52:30 2008
@@ -72,6 +72,10 @@
                         'status' => {
                             'new_value' => 'open',
                             'old_value' => undef
+                        },
+                        'creator' => {
+                            'new_value' => 'bob@' . replica_uuid_for('bob'),
+                            'old_value' => undef
                         }
                     },
                     'record_type' => 'Bug'
@@ -131,7 +135,11 @@
                         'status' => {
                             'new_value' => 'new',
                             'old_value' => undef
-                        }
+                        },
+                        'creator' => {
+                            'new_value' => 'bob@' . replica_uuid_for('bob'),
+                            'old_value' => undef,
+                        },
                     },
                     'record_type' => 'Bug'
                 }