Add test for three way merge

so-fancy · Mar 17, 2016 · 1c417ac · 1c417ac
1 parent 6054b77
commit 1c417ac
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/test/header_clean.bats b/test/header_clean.bats
@@ -63,6 +63,15 @@ output=$( load_fixture "file-moves" | $diff_so_fancy )
     refute_output --partial 'Use of uninitialized value'
 }
 
+@test "Three way merge" {
+	# stderr forced into output
+	output=$( load_fixture "complex-hunks" | $diff_so_fancy )
+	# Lines should not have + or - in at the start
+	refute_output --partial '-	my $foo = shift(); # Array passed in by reference'
+	refute_output --partial '+	my $array = shift(); # Array passed in by reference'
+	refute_output --partial ' sub parse_hunk_header {'
+}
+
 @test "mnemonicprefix handling" {
 	output=$( load_fixture "mnemonicprefix" | $diff_so_fancy )
 	assert_output --partial 'modified: test/header_clean.bats'