Skip to content

Commit

Permalink
Merge pull request #13 from scala-steward/update/scalatest-3.1.0
Browse files Browse the repository at this point in the history
Update scalatest to 3.1.0
  • Loading branch information
t3hnar committed Dec 2, 2019
2 parents 25df92a + ede0cea commit 95f916e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ crossScalaVersions := Seq("2.13.0", "2.12.9")
libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.3.4",
"commons-codec" % "commons-codec" % "1.13" ,
"org.scalatest" %% "scalatest" % "3.0.8" % Test
"org.scalatest" %% "scalatest" % "3.1.0" % Test
)

licenses := Seq(("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")))
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/evolutiongaming/crypto/CryptoSpec.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.evolutiongaming.crypto

import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class CryptoSpec extends FlatSpec with Matchers {
class CryptoSpec extends AnyFlatSpec with Matchers {
behavior of "Crypto"

it should "decrypt data encrypted with same AES key" in {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.evolutiongaming.crypto

import com.typesafe.config.ConfigFactory
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
import org.scalatest.BeforeAndAfterEach
import DecryptConfig.DecryptConfigOps
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class DecryptConfigSpec extends FlatSpec with BeforeAndAfterEach with Matchers {
class DecryptConfigSpec extends AnyFlatSpec with BeforeAndAfterEach with Matchers {
val correctPassword = "jboss"

private def decrypt(configFile: String): String = {
Expand Down

0 comments on commit 95f916e

Please sign in to comment.