Skip to content

Commit 74109b8

Browse files
tperekraboof
authored andcommitted
Update scalatest dependency to v.3.1.0 (#78)
1 parent 676d512 commit 74109b8

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Dependencies {
66
val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.25"
77
val sprayJson = "io.spray" %% "spray-json" % "1.3.5"
88
val jsonLenses = "net.virtual-void" %% "json-lenses" % "0.6.2"
9-
val scalatest = "org.scalatest" %% "scalatest" % "3.0.8"
9+
val scalatest = "org.scalatest" %% "scalatest" % "3.1.0"
1010
// format: ON
1111

1212
// Dependency scoping functions

stamina-core/src/test/scala/stamina/StaminaSpec.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package stamina
22

33
import org.scalatest._
4+
import org.scalatest.matchers.should.Matchers
5+
import org.scalatest.wordspec.AnyWordSpecLike
46

57
abstract class StaminaSpec
6-
extends WordSpecLike
8+
extends AnyWordSpecLike
79
with Matchers
810
with OptionValues
911
with TryValues

stamina-json/src/test/scala/stamina/json/StaminaJsonSpec.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package stamina.json
22

33
import org.scalatest._
4+
import org.scalatest.matchers.should.Matchers
5+
import org.scalatest.wordspec.AnyWordSpecLike
46

57
abstract class StaminaJsonSpec
6-
extends WordSpecLike
8+
extends AnyWordSpecLike
79
with Matchers
810
with OptionValues
911
with TryValues

stamina-testkit/src/main/scala/stamina/testkit/StaminaTestKit.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.util.Base64
66

77
import scala.util._
88

9-
trait StaminaTestKit { self: org.scalatest.WordSpecLike =>
9+
trait StaminaTestKit { self: org.scalatest.wordspec.AnyWordSpecLike =>
1010

1111
val defaultSampleId = "default"
1212
case class PersistableSample[FromVersion <: Version: VersionInfo](sampleId: String, persistable: AnyRef, description: Option[String]) {
@@ -20,7 +20,7 @@ trait StaminaTestKit { self: org.scalatest.WordSpecLike =>
2020
def sample(sampleId: String, persistable: AnyRef) = new PersistableSample[V1](sampleId, persistable, Some(sampleId))
2121
def sample(sampleId: String, persistable: AnyRef, description: String) = new PersistableSample[V1](sampleId, persistable, Some(description))
2222

23-
implicit class TestablePersisters(persisters: Persisters) extends org.scalatest.Matchers {
23+
implicit class TestablePersisters(persisters: Persisters) extends org.scalatest.matchers.should.Matchers {
2424
def generateTestsFor(samples: PersistableSample[_]*): Unit = {
2525
samples.foreach { sample =>
2626
generateRoundtripTestFor(sample)

stamina-testkit/src/test/scala/stamina/testkit/ScalatestTestGenerationSpec.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import java.io.File
66
import org.scalatest._
77
import org.scalatest.events._
88
import org.scalatest.matchers.{ BePropertyMatchResult, BePropertyMatcher }
9+
import org.scalatest.wordspec.AnyWordSpecLike
910

1011
import scala.reflect.ClassTag
1112

@@ -20,7 +21,7 @@ class ScalatestTestGenerationSpec extends StaminaTestKitSpec {
2021

2122
"A spec generated by StaminaTestKit" when {
2223
"there is only version 1" should {
23-
val spec = new StaminaTestKit with WordSpecLike {
24+
val spec = new StaminaTestKit with AnyWordSpecLike {
2425
val persisters = Persisters(ItemPersister("item1"))
2526
"TestDomainSerialization" should {
2627
persisters.generateTestsFor(
@@ -66,7 +67,7 @@ class ScalatestTestGenerationSpec extends StaminaTestKitSpec {
6667
}
6768

6869
"the sample is only suitable for version 2 and up" should {
69-
val spec = new StaminaTestKit with WordSpecLike {
70+
val spec = new StaminaTestKit with AnyWordSpecLike {
7071
val persisters = Persisters(ItemPersister("item2"))
7172
"TestDomainSerialization" should {
7273
persisters.generateTestsFor(
@@ -86,7 +87,7 @@ class ScalatestTestGenerationSpec extends StaminaTestKitSpec {
8687
}
8788

8889
"a sample is available for both version 1 and (the migrated event) version 2" should {
89-
val spec = new StaminaTestKit with WordSpecLike {
90+
val spec = new StaminaTestKit with AnyWordSpecLike {
9091
val persisters = Persisters(ItemPersister("item1"))
9192
"TestDomainSerialization" should {
9293
persisters.generateTestsFor(
@@ -108,7 +109,7 @@ class ScalatestTestGenerationSpec extends StaminaTestKitSpec {
108109
}
109110
}
110111

111-
private def execSpec(spec: WordSpecLike): EventRecordingReporter = {
112+
private def execSpec(spec: AnyWordSpecLike): EventRecordingReporter = {
112113
val myRep = new EventRecordingReporter
113114
spec.run(None, Args(myRep, Stopper.default, Filter(), ConfigMap.empty, None, new Tracker, Set.empty))
114115
myRep

stamina-testkit/src/test/scala/stamina/testkit/StaminaTestKitSpec.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package stamina
22
package testkit
33

44
import org.scalatest._
5+
import org.scalatest.matchers.should.Matchers
6+
import org.scalatest.wordspec.AnyWordSpecLike
57

68
abstract class StaminaTestKitSpec
7-
extends WordSpecLike
9+
extends AnyWordSpecLike
810
with Matchers
911
with OptionValues
1012
with TryValues

0 commit comments

Comments
 (0)