Make messages used in Rule generator be generated

davegurnell · Dec 18, 2017 · f0341f5 · f0341f5
1 parent ec26600
commit f0341f5
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/checklist/src/test/scala/checklist/laws/package.scala b/checklist/src/test/scala/checklist/laws/package.scala
@@ -13,11 +13,14 @@ trait ScalacheckInstances {
   implicit def arbRule[A: Arbitrary, B: Arbitrary](implicit arbF: Arbitrary[A => Ior[A, B]]): Arbitrary[Rule[A, B]] = Arbitrary(
     for {
       f <- arbF.arbitrary
-    } yield Rule.pure(f.map {
-      case Ior.Both(_, b) => Ior.both(NonEmptyList.of(ErrorMessage("both")), b)
-      case Ior.Left(_) => Ior.left(NonEmptyList.of(ErrorMessage("left")))
-      case Ior.Right(a) => Ior.right(a)
-    })
+      messages <- Arbitrary.arbitrary[Messages]
+    } yield {
+      Rule.pure(f(_).fold(
+        _ => Ior.left(messages),
+        Ior.right(_),
+        (_, b) => Ior.both(messages, b)
+      ))
+    }
   )
 
   implicit val arbPath: Arbitrary[Path] = Arbitrary(