mock: improve ergonomics when an ExpectedSpan
is needed
#3097
+340
−200
ExpectedSpan
is needed
#3097