Skip to content

Commit

Permalink
Issue davegurnell#1: Fix ExecutionContext in context tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
rpiaggio committed Aug 20, 2018
1 parent 8f7bcdd commit 4d66ce7
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions core/src/test/scala/checklist/ContextSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import monix.execution.Scheduler
import org.scalatest.{AsyncFreeSpec, Matchers}

import scala.collection.immutable.HashSet
import scala.concurrent.{ExecutionContext, Future}
import scala.concurrent.Future

class ContextSpec extends AsyncFreeSpec with Matchers {
implicit override def executionContext: Scheduler = monix.execution.Scheduler.Implicits.global

val rule1 = Rule.pass[Int]
val rule2 = rule1.liftTo[Future]
Expand All @@ -36,7 +37,7 @@ class ContextSpec extends AsyncFreeSpec with Matchers {
override def apply[A](f: Future[A]): Task[A] = Task.deferFuture(f)
}

def taskToFuture(implicit ec: ExecutionContext, sch: Scheduler): Task ~> Future = new (Task ~> Future) {
def taskToFuture: Task ~> Future = new (Task ~> Future) {
override def apply[A](t: Task[A]): Future[A] = t.runAsync
}

Expand Down Expand Up @@ -73,17 +74,13 @@ class ContextSpec extends AsyncFreeSpec with Matchers {
}

"Task unique email" in {
import monix.execution.Scheduler.Implicits.global

val validator = isEmail and isUniqueTask
validator("[email protected]").runAsync map (_ should be(Ior.right("[email protected]")))
validator("[email protected]").runAsync map (_ should be(Ior.left(errors("Email is already registered"))))
validator("hello@").runAsync map (_ should be(Ior.left(errors("Must be an email"))))
}

"Id, Future and Task unique non-empty email (as Task)" in {
import monix.execution.Scheduler.Implicits.global

implicit val transformation: Future ~> Task = futureToTask

val validator = Rule.nonEmpty[String] and isUniqueTask and isEmailFuture
Expand All @@ -94,8 +91,6 @@ class ContextSpec extends AsyncFreeSpec with Matchers {
}

"Id, Future and Task unique non-empty email (as Future)" in {
import monix.execution.Scheduler.Implicits.global

implicit val transformation: Task ~> Future = taskToFuture

val validator = isUniqueTask and isEmailFuture and Rule.nonEmpty[String]
Expand All @@ -106,8 +101,6 @@ class ContextSpec extends AsyncFreeSpec with Matchers {
}

"IO, Future and Task unique non-empty email (as Future)" in {
import monix.execution.Scheduler.Implicits.global

implicit val transformation1: Task ~> Future = taskToFuture
implicit val transformation2: IO ~> Future = ioToFuture

Expand Down

0 comments on commit 4d66ce7

Please sign in to comment.