Skip to content

Update scalatest to 3.2.0 #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Update scalatest to 3.2.0 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50ce351
Update scalatest to 3.2.0
scala-steward Jun 19, 2020
d967966
Merge branch 'master' into update/scalatest-3.2.0
scala-steward Jul 3, 2020
23d67b7
Update scalatest to 3.2.0
scala-steward Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Version {
val mockito = "1.5.17"
val scala = "2.12.11"
val crossScala = List(scala, "2.11.12", "2.13.1")
val scalaTest = "3.0.8"
val scalaTest = "3.2.0"
val slf4j = "1.7.30"
}

Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ import java.io._
import org.mockito.ArgumentMatchers._
import org.mockito.Mockito._
import org.slf4j.{ Logger => Underlying }
import org.scalatest.{ Matchers, WordSpec }
import org.scalatestplus.mockito.MockitoSugar
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

trait Varargs {
// TODO: we used to wrap in List(...): _*, which I assume was to force the varags method to be chosen.
// I encapsulated that here in something that works across 2.12/2.13.
def forceVarargs[T](xs: T*): scala.Seq[T] = scala.Seq(xs: _*)
}

class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
class LoggerSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs {

// Error

Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package com.typesafe.scalalogging
import org.mockito.ArgumentMatchers._
import org.mockito.Mockito._
import org.scalatestplus.mockito.MockitoSugar
import org.scalatest.{ Matchers, WordSpec }
import org.slf4j.{ Logger => Underlying }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
class LoggerTakingImplicitSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs {

case class CorrelationId(value: String)

Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import org.mockito.ArgumentMatchers._
import org.mockito.Mockito._
import org.slf4j.{ Logger => Underlying }
import org.slf4j.Marker
import org.scalatest.{ Matchers, WordSpec }
import org.scalatestplus.mockito.MockitoSugar
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

object DummyMarker extends Marker {
def add(childMarker: Marker): Unit = {}
Expand All @@ -39,7 +40,7 @@ object DummyMarker extends Marker {
def remove(child: Marker): Boolean = false
}

class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
class LoggerWithMarkerSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs {

// Error

Expand Down