@@ -245,15 +245,15 @@ func TestMergeBranches(t *testing.T) {
245245 t .Fatalf ("Merge failed: %v" , err )
246246 }
247247
248- // Root should now have original 4 + 3 new messages from feature.
248+ // Root should now have original 3 + 3 new messages from feature.
249249 root := bm .Branches [bm .RootBranch ]
250- if len (root .Messages ) != 7 {
251- t .Fatalf ("expected 7 messages after merge, got %d" , len (root .Messages ))
250+ if len (root .Messages ) != 6 {
251+ t .Fatalf ("expected 6 messages after merge, got %d" , len (root .Messages ))
252252 }
253253
254254 // The merged messages should be the ones after fork point.
255- if root .Messages [4 ].Content != "Feature done part 1" {
256- t .Fatalf ("expected merged message, got %q" , root .Messages [4 ].Content )
255+ if root .Messages [3 ].Content != "Feature done part 1" {
256+ t .Fatalf ("expected merged message, got %q" , root .Messages [3 ].Content )
257257 }
258258
259259 // Source branch should be marked as merged.
@@ -381,8 +381,8 @@ func TestCompareBranches(t *testing.T) {
381381 if ! containsStr (output , "Please implement auth" ) {
382382 t .Fatalf ("expected divergence message in output, got:\n %s" , output )
383383 }
384- if ! containsStr (output , "JWT route " ) {
385- t .Fatalf ("expected JWT in output, got:\n %s" , output )
384+ if ! containsStr (output , "Looks good " ) {
385+ t .Fatalf ("expected last message of approach-A in output, got:\n %s" , output )
386386 }
387387 if ! containsStr (output , "session route" ) {
388388 t .Fatalf ("expected session in output, got:\n %s" , output )
0 commit comments