WIP: build.sbt,ApiImplSpec.scala,AuthApiImplSpec.scala,GuardDslSpec.scala,JWTSpec.scala,DbSpec.scala,GraphSpec.scala,CuidSpec.scala,OAuthClientSpec.scala,WustEventMapperSpec.scala,AlgorithmsSpec.scala,CollectionSpec.scala,DepthFirstSearchSpec.scala,UrlConfigParsingSpec.scala,GraphChangesAutomationSpec.scala,ViewAntiCrashSpec.scala

Author: fdietze

build.sbt

@@ -7,7 +7,7 @@ dynver in ThisBuild ~= (_.replace('+', '-')) // TODO: https://github.com/dwijnan
 import Def.{setting => dep}
 
 // -- common setting --
-scalaVersion in ThisBuild := "2.13.3"
+scalaVersion in ThisBuild := "2.12.12"
 
  inThisBuild(
    List(

core/src/test/scala/wust/core/ApiImplSpec.scala

@@ -10,7 +10,7 @@
 // import java.time.LocalDateTime
 // import scala.concurrent.duration._
 
-// class ApiImplSpec extends AsyncFreeSpec with MustMatchers with ApiTestKit {
+// class ApiImplSpec extends AsyncFreeSpec with must.Matchers with ApiTestKit {
 
 //   object User {
 //     def apply(id: Long, name: String): User = new User(id, name, isImplicit = false, 0)

core/src/test/scala/wust/core/AuthApiImplSpec.scala

@@ -12,7 +12,7 @@
 // import scala.concurrent.duration._
 // import com.roundeights.hasher.Hasher
 
-// class AuthApiImplSpec extends AsyncFreeSpec with MustMatchers with ApiTestKit {
+// class AuthApiImplSpec extends AsyncFreeSpec with must.Matchers with ApiTestKit {
 //   implicit def passwordToDigest(pw: String): Array[Byte] = Hasher(pw).bcrypt
 //   // implicit class EqualityByteArray(val arr: Array[Byte]) {
 //   //   def mustEqualDigest(pw: String) = assert(passwordToDigest(pw)

core/src/test/scala/wust/core/GuardDslSpec.scala

@@ -12,7 +12,7 @@
 // import scala.concurrent.Future
 // import scala.concurrent.duration._
 
-// class GuardDslSpec extends AsyncFreeSpec with MustMatchers with DbMocks {
+// class GuardDslSpec extends AsyncFreeSpec with must.Matchers with DbMocks {
 //   val implicitUserDb = Data.User(14, "implicit", isImplicit = true, 0)
 //   val implicitUser = DbConversions.forClient(implicitUserDb)
 //   val initialUser = User(11, "existing", isImplicit = false, 0)

core/src/test/scala/wust/core/JWTSpec.scala

@@ -3,13 +3,13 @@ package wust.core
 import java.time.Instant
 
 import org.scalatest._
+import org.scalatest.matchers._
+import org.scalatest.freespec.AnyFreeSpec
 import wust.api.{AuthUser, Authentication}
 import wust.core.auth.JWT
 import wust.ids._
-import org.scalatest.matchers._
 
 import scala.concurrent.duration._
-import org.scalatest.freespec.AnyFreeSpec
 
 class JWTSpec extends AnyFreeSpec with must.Matchers {
   val jwt = new JWT("secret", 1 hours)

database/src/it/scala/wust/db/DbSpec.scala

@@ -25,7 +25,7 @@
 //  }
 //}
 
-//class DbSpec extends DbIntegrationTestSpec with MustMatchers {
+//class DbSpec extends DbIntegrationTestSpec with must.Matchers {
 //  import DbSpec._
 //  implicit def passwordToDigest(pw: String): Array[Byte] = pw.map(_.toByte).toArray
 //  implicit class EqualityByteArray(val arr: Array[Byte]) {

graph/src/test/scala/wust/graph/GraphSpec.scala

@@ -1,9 +1,11 @@
 package wust.graph
 
 import org.scalatest._
+import org.scalatest.matchers._
+import org.scalatest.freespec.AnyFreeSpec
 import wust.ids._
 
-class GraphSpec extends FreeSpec with MustMatchers {
+class GraphSpec extends AnyFreeSpec with must.Matchers {
   implicit def intToNodeId(id: Int): NodeId = NodeId(Cuid(id, 0))
   implicit def idToNode(id: Int): Node = Node.Content(id = id, data = NodeData.PlainText("content"), role = NodeRole.default, meta = NodeMeta(NodeAccess.ReadWrite))
   implicit def nodeListToMap(nodes: List[Int]): List[Node] = nodes.map(idToNode)

ids/src/test/scala/wust/ids/CuidSpec.scala

@@ -3,8 +3,10 @@ package wust.ids
 import java.util.UUID
 
 import org.scalatest._
+import org.scalatest.matchers._
+import org.scalatest.freespec.AnyFreeSpec
 
-class CuidSpec extends FreeSpec with MustMatchers {
+class CuidSpec extends AnyFreeSpec with must.Matchers {
   "uuid" in {
     val original = new UUID(12, 25)
     val bag = Cuid.fromUuid(original)

sdk/jvm/src/test/scala/wust/sdk/OAuthClientSpec.scala

@@ -5,24 +5,26 @@ import java.util.UUID
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import monix.reactive.subjects.PublishSubject
 import org.scalatest._
+import org.scalatest.matchers._
+import org.scalatest.freespec.AnyFreeSpec
 import wust.api.{AuthUser, Authentication}
 import wust.ids.UserId
 
-class OAuthClientBasicSpec extends FreeSpec with EitherValues with Matchers {
+class OAuthClientBasicSpec extends AnyFreeSpec with EitherValues with must.Matchers {
 
   def getClient(path: String = "wust.test") = {
     Config.load(path).map(config => OAuthClient.apply(config.oAuth, config.appServer, config.wustServer))
   }
 
   "load config" in {
     val config = Config.load("wust.test")
-    config should be ('right)
+    config must be ('right)
   }
 
   "can instanziate client" in {
     val client = getClient()
 
-    client should be ('right)
+    client must be ('right)
   }
 
   "generate url" in {
@@ -31,8 +33,8 @@ class OAuthClientBasicSpec extends FreeSpec with EitherValues with Matchers {
     val randomState = UUID.randomUUID().toString
     val url = client.map(c => c.authorizeUrlWithState(Authentication.Verified(AuthUser.Real(UserId.fresh, UserId.fresh.toBase58, 0, None), 0, Authentication.Token("token")), List("read:org", "read:user", "repo" , "write:discussion"), randomState).map(_.toString))
 
-    url should be ('right)
-    url shouldEqual Right(Some(s"http://localhost/wust/oauth/authorize?state=$randomState&scope=read:org,read:user,repo,write:discussion&redirect_uri=http://localhost:8080/oauth/auth&client_id=clientId&response_type=code"))
+    url must be ('right)
+    url mustEqual Right(Some(s"http://localhost/wust/oauth/authorize?state=$randomState&scope=read:org,read:user,repo,write:discussion&redirect_uri=http://localhost:8080/oauth/auth&client_id=clientId&response_type=code"))
 
   }
 
@@ -42,34 +44,34 @@ class OAuthClientBasicSpec extends FreeSpec with EitherValues with Matchers {
     val randomState = UUID.randomUUID().toString
     val url = client.map(c => c.authorizeUrlWithState(Authentication.Verified(AuthUser.Real(UserId.fresh, UserId.fresh.toBase58, 0, None), 0, Authentication.Token("token")), List("read:org", "read:user", "repo" , "write:discussion"), randomState).map(_.toString))
 
-    url should be ('right)
-    url shouldEqual Right(Some(s"http://localhost/oauth/authorize?state=$randomState&scope=read:org,read:user,repo,write:discussion&redirect_uri=http://localhost:8080/oauth/auth&client_id=clientId&response_type=code"))
+    url must be ('right)
+    url mustEqual Right(Some(s"http://localhost/oauth/authorize?state=$randomState&scope=read:org,read:user,repo,write:discussion&redirect_uri=http://localhost:8080/oauth/auth&client_id=clientId&response_type=code"))
 
   }
 }
 
-class OAuthClientRoutingSpec extends WordSpec with EitherValues with Matchers with ScalatestRouteTest {
-
-  private val client = Config.load("wust.test").map(config => OAuthClient.apply(config.oAuth, config.appServer, config.wustServer)).toOption.get
-  private val tokenObserver = PublishSubject[AuthenticationData]
-  private val testRoute = client.route(tokenObserver)
-
-  "oauth ignore empty routing" in {
-      Get() ~> testRoute ~> check {
-      handled shouldBe false
-    }
-  }
-
-    "oauth ignore route without paramaters" in {
-      Get(client.oAuthConfig.authPath.getOrElse("oauth/auth")) ~> testRoute ~> check {
-        handled shouldBe false
-      }
-    }
-
-  "oauth handles route with paramaters correctly" in {
-    val routePath = s"/${client.oAuthConfig.authPath.getOrElse("oauth/auth")}?code=blub&state=bla"
-    Get(routePath) ~> testRoute ~> check {
-      handled shouldBe true
-    }
-  }
-}
+// class OAuthClientRoutingSpec extends AnyFreeSpec with EitherValues with must.Matchers with ScalatestRouteTest {
+
+//   private val client = Config.load("wust.test").map(config => OAuthClient.apply(config.oAuth, config.appServer, config.wustServer)).toOption.get
+//   private val tokenObserver = PublishSubject[AuthenticationData]
+//   private val testRoute = client.route(tokenObserver)
+
+//   "oauth ignore empty routing" in {
+//       Get() ~> testRoute ~> check {
+//       handled mustBe false
+//     }
+//   }
+
+//     "oauth ignore route without paramaters" in {
+//       Get(client.oAuthConfig.authPath.getOrElse("oauth/auth")) ~> testRoute ~> check {
+//         handled mustBe false
+//       }
+//     }
+
+//   "oauth handles route with paramaters correctly" in {
+//     val routePath = s"/${client.oAuthConfig.authPath.getOrElse("oauth/auth")}?code=blub&state=bla"
+//     Get(routePath) ~> testRoute ~> check {
+//       handled mustBe true
+//     }
+//   }
+// }

slackApp/src/test/scala/wust/slack/WustEventMapperSpec.scala

@@ -71,7 +71,7 @@ object TestConstants {
   val userId: UserId = UserId.fromBase58String("5R5TZsZJeL3enTMmq8Jwmg").right.get
 }
 
-class WustEventMapperSpec extends FreeSpec with EitherValues with Matchers {
+class WustEventMapperSpec extends AnyFreeSpec with EitherValues with Matchers {
 
   implicit val system: ActorSystem = ActorSystem("slack-test-wust-event")
   import monix.execution.Scheduler.Implicits.global