@@ -134,8 +134,12 @@ testSelectedBranchMerge = TestCase $ do
134134 rootTrans <- assertEither $ transactionForUUID (fakeUUID 1) graph''
135135 branchBTrans <- assertMaybe (transactionForHead "branchB" graph'') "failed to find branchB head"
136136 assertEqual "head of merged transaction was removed" (transactionUUID branchBTrans) (fakeUUID 3)
137− --assertEqual "bad merge" mergedContext (transactionContext rootTrans)
138137
138+ --validate that the branchB relvar does *not* appear in the merge because branchA was selected
139+ mergeTrans <- assertMaybe (transactionForUUID (fakeUUID 4) graph'')
140+ assertTrue "branchOnlyRelvar is present in merge" (M.notMember "branchBOnlyRelvar" (relationVariables (transactionContext mergeTrans)))
141+
142+-- try various individual components conflicts
139143testUnionPreferMergeStrategy :: Test
140144testUnionPreferMergeStrategy = TestCase $ undefined
141145