Update scalatest to 3.1.0

build.sbt

@@ -52,7 +52,7 @@ libraryDependencies ++= Seq(
   "com.iheart"                 %% "ficus"                % "1.4.7",
   "ch.qos.logback"             % "logback-classic"       % "1.2.3",
   "com.typesafe.scala-logging" %% "scala-logging"        % "3.9.2",
-  "org.scalatest"              %% "scalatest"            % "3.0.8" % Test,
+  "org.scalatest"              %% "scalatest"            % "3.1.0" % Test,
   "com.dimafeng"               %% "testcontainers-scala" % "0.33.0" % Test,
   "org.testcontainers"         % "postgresql"            % "1.12.3" % Test,
   "com.typesafe.akka"          %% "akka-stream-testkit"  % "2.6.0" % Test,

src/test/scala/me/herzrasen/stash/ConfigFieldsTest.scala

@@ -2,10 +2,11 @@ package me.herzrasen.stash
 
 import com.typesafe.config.{Config, ConfigFactory}
 import me.herzrasen.stash.ConfigFields._
-import org.scalatest.{FlatSpec, Matchers}
 import scala.concurrent.duration._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class ConfigFieldsTest extends FlatSpec with Matchers {
+class ConfigFieldsTest extends AnyFlatSpec with Matchers {
 
   "http.server.port" should "be read from the config" in {
     val config: Config = ConfigFactory.parseString("http.server.port = 9999")

src/test/scala/me/herzrasen/stash/auth/BearerTokenTest.scala

@@ -1,8 +1,9 @@
 package me.herzrasen.stash.auth
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class BearerTokenTest extends FlatSpec with Matchers {
+class BearerTokenTest extends AnyFlatSpec with Matchers {
 
   "A BearerToken" should "be created" in {
     val bearerStr =

src/test/scala/me/herzrasen/stash/auth/JwtDirectivesTest.scala

@@ -14,9 +14,10 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
 import me.herzrasen.stash.domain.{Roles, User}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JwtDirectivesTest extends FlatSpec with Matchers with ScalatestRouteTest {
+class JwtDirectivesTest extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
   implicit val hmacSecret: HmacSecret = HmacSecret("testsecret")
 

src/test/scala/me/herzrasen/stash/auth/JwtUtilTest.scala

@@ -7,9 +7,10 @@ import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
 import me.herzrasen.stash.domain.Roles.Admin
 import me.herzrasen.stash.domain.{Roles, User}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JwtUtilTest extends FlatSpec with Matchers {
+class JwtUtilTest extends AnyFlatSpec with Matchers {
 
   implicit val hmacSecret: HmacSecret = HmacSecret("jwt-util")
 

src/test/scala/me/herzrasen/stash/domain/RolesTest.scala

@@ -1,9 +1,10 @@
 package me.herzrasen.stash.domain
 
 import me.herzrasen.stash.domain.Roles._
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class RolesTest extends FlatSpec with Matchers {
+class RolesTest extends AnyFlatSpec with Matchers {
 
   "Parsing from String" should "be Admin" in {
     val admin = Roles.parse("admin")

src/test/scala/me/herzrasen/stash/http/server/AuthRouteTest.scala

@@ -9,9 +9,10 @@ import me.herzrasen.stash.auth.{HmacSecret, JwtUtil}
 import me.herzrasen.stash.domain.Roles.Admin
 import me.herzrasen.stash.domain.{Roles, User}
 import me.herzrasen.stash.repository.{InMemoryUserRepository, UserRepository}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class AuthRouteTest extends FlatSpec with Matchers with ScalatestRouteTest {
+class AuthRouteTest extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
   implicit val hmacSecret: HmacSecret = HmacSecret("auth-route-test")
 

src/test/scala/me/herzrasen/stash/http/server/ItemRouteTest.scala

@@ -8,11 +8,12 @@ import me.herzrasen.stash.auth.{HmacSecret, JwtUtil}
 import me.herzrasen.stash.domain._
 import me.herzrasen.stash.json.JsonSupport._
 import me.herzrasen.stash.repository._
-import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class ItemRouteTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with SprayJsonSupport
     with ScalatestRouteTest {

src/test/scala/me/herzrasen/stash/http/server/QuantityRouteTest.scala

@@ -8,13 +8,14 @@ import me.herzrasen.stash.auth.{HmacSecret, JwtUtil}
 import me.herzrasen.stash.domain.{NewQuantity, Quantity, Roles, User}
 import me.herzrasen.stash.json.JsonSupport._
 import me.herzrasen.stash.repository.{InMemoryQuantityRepository, QuantityRepository}
-import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
 
 import scala.concurrent.Future
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class QuantityRouteTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with ScalatestRouteTest
     with SprayJsonSupport {

src/test/scala/me/herzrasen/stash/http/server/RouteTest.scala

@@ -15,9 +15,10 @@ import me.herzrasen.stash.repository.{
   ShopRepository,
   UserRepository
 }
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class RouteTest extends FlatSpec with Matchers with ScalatestRouteTest {
+class RouteTest extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
   implicit val hmacSecret: HmacSecret = HmacSecret("route-test")
 

src/test/scala/me/herzrasen/stash/http/server/ShopRouteTest.scala

@@ -6,13 +6,14 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest
 import me.herzrasen.stash.auth.{HmacSecret, JwtUtil}
 import me.herzrasen.stash.domain.{Roles, Shop, User}
 import me.herzrasen.stash.repository.{InMemoryShopRepository, ShopRepository}
-import org.scalatest.{FlatSpec, Matchers}
 import me.herzrasen.stash.json.JsonSupport._
 import spray.json._
 
 import scala.concurrent.Future
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class ShopRouteTest extends FlatSpec with Matchers with ScalatestRouteTest {
+class ShopRouteTest extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
   implicit val hmacSecret: HmacSecret = HmacSecret("shop-route-test")
 

src/test/scala/me/herzrasen/stash/http/server/UserRouteTest.scala

@@ -10,13 +10,14 @@ import me.herzrasen.stash.auth.{HmacSecret, JwtUtil}
 import me.herzrasen.stash.domain.{NewUser, Roles, User}
 import me.herzrasen.stash.json.JsonSupport._
 import me.herzrasen.stash.repository.{InMemoryUserRepository, UserRepository}
-import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
 
 import scala.concurrent.Future
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class UserRouteTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with SprayJsonSupport
     with ScalatestRouteTest {

src/test/scala/me/herzrasen/stash/http/server/WebServerTest.scala

@@ -3,12 +3,13 @@ package me.herzrasen.stash.http.server
 import akka.actor.ActorSystem
 import akka.http.scaladsl.server.directives.{PathDirectives, RouteDirectives}
 import akka.http.scaladsl.server.{Route, RouteConcatenation}
-import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, ExecutionContext}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class WebServerTest extends FlatSpec with Matchers {
+class WebServerTest extends AnyFlatSpec with Matchers {
 
   object TestRoute
       extends PathDirectives

src/test/scala/me/herzrasen/stash/json/JsonSupportTest.scala

@@ -3,10 +3,11 @@ package me.herzrasen.stash.json
 import me.herzrasen.stash.domain.Roles.Role
 import me.herzrasen.stash.domain.{Item, NewItem, NewQuantity, NewUser, Quantity, Roles, Shop, User}
 import me.herzrasen.stash.json.JsonSupport._
-import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JsonSupportTest extends FlatSpec with Matchers {
+class JsonSupportTest extends AnyFlatSpec with Matchers {
 
   "A Role" should "be serialized / deserialized correctly for an Admin" in {
     val role: Role = Roles.Admin

src/test/scala/me/herzrasen/stash/repository/PostgresItemRepositoryTest.scala

@@ -7,13 +7,14 @@ import com.typesafe.config.{Config, ConfigFactory}
 import io.getquill.context.monix.Runner
 import io.getquill.{PostgresMonixJdbcContext, SnakeCase}
 import me.herzrasen.stash.domain.{Item, Quantity, Shop}
-import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class PostgresItemRepositoryTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with ForAllTestContainer {
 

src/test/scala/me/herzrasen/stash/repository/PostgresQuantityRepositoryTest.scala

@@ -7,15 +7,16 @@ import com.typesafe.config.{Config, ConfigFactory}
 import io.getquill.{PostgresMonixJdbcContext, SnakeCase}
 import io.getquill.context.monix.Runner
 import me.herzrasen.stash.domain.Quantity
-import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.{Await, Future}
 import scala.concurrent.duration.Duration
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class PostgresQuantityRepositoryTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with ForAllTestContainer {
 

src/test/scala/me/herzrasen/stash/repository/PostgresShopRepositoryTest.scala

@@ -7,14 +7,15 @@ import com.typesafe.config.{Config, ConfigFactory}
 import io.getquill.context.monix.Runner
 import io.getquill.{PostgresMonixJdbcContext, SnakeCase}
 import me.herzrasen.stash.domain.Shop
-import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class PostgresShopRepositoryTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with ForAllTestContainer {
 

src/test/scala/me/herzrasen/stash/repository/PostgresUserRepositoryTest.scala

@@ -13,14 +13,15 @@ import me.herzrasen.stash.domain.Roles.{
   User => UserRole
 }
 import me.herzrasen.stash.domain.{Roles, User}
-import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class PostgresUserRepositoryTest
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with ForAllTestContainer {