Merge pull request #284 from scala-steward/update/scalatest-3.1.0

Update scalatest to 3.1.0
playframework · Dec 15, 2019 · df09ed6 · df09ed6
2 parents 7dd49d9 + eed5765
commit df09ed6
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 62 deletions.
diff --git a/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/BufferedContentSpec.scala
@@ -3,13 +3,13 @@
  */
 package play.twirl.api.test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api._
 
 import scala.collection.immutable
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class BufferedContentSpec extends WordSpec with MustMatchers {
+class BufferedContentSpec extends AnyWordSpec with Matchers {
 
   "equality checking" should {
 

diff --git a/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/FormatSpec.scala
@@ -4,10 +4,10 @@
 package play.twirl.api
 package test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class FormatSpec extends WordSpec with MustMatchers {
+class FormatSpec extends AnyWordSpec with Matchers {
 
   "Formats" should {
     "show null text values as empty" in {

diff --git a/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala b/api/shared/src/test/scala/play/twirl/api/test/StringInterpolationSpec.scala
@@ -8,10 +8,10 @@ import java.util.ArrayList
 import java.util.Optional
 import java.util.{ List => JList }
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class StringInterpolationSpec extends WordSpec with MustMatchers {
+class StringInterpolationSpec extends AnyWordSpec with Matchers {
 
   "StringInterpolation" should {
     "leave string parts untouched" in {

diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,8 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv
 // Binary compatibility is this version
 val previousVersion: Option[String] = None
 
+val ScalaTestVersion = "3.1.0"
+
 def binaryCompatibilitySettings(org: String, moduleName: String, scalaBinVersion: String): Set[ModuleID] = {
   if (scalaBinVersion.equals(scala213)) Set.empty
   else
@@ -91,7 +93,7 @@ lazy val api = crossProject(JVMPlatform, JSPlatform)
     name := "twirl-api",
     jsEnv := nodeJs,
     libraryDependencies ++= scalaXml.value,
-    libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
+    libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % "test",
     mimaPreviousArtifacts := binaryCompatibilitySettings(
       organization.value,
       moduleName.value,
@@ -109,8 +111,8 @@ lazy val parser = project
   .settings(
     name := "twirl-parser",
     libraryDependencies ++= scalaParserCombinators(scalaVersion.value),
-    libraryDependencies += "com.novocode"  % "junit-interface" % "0.11"                        % "test",
-    libraryDependencies += "org.scalatest" %%% "scalatest"     % scalatest(scalaVersion.value) % "test",
+    libraryDependencies += "com.novocode"  % "junit-interface" % "0.11"           % "test",
+    libraryDependencies += "org.scalatest" %%% "scalatest"     % ScalaTestVersion % "test",
     mimaPreviousArtifacts := binaryCompatibilitySettings(organization.value, moduleName.value, scalaBinaryVersion.value)
   )
 
@@ -141,7 +143,7 @@ lazy val plugin = project
     name := "sbt-twirl",
     organization := "com.typesafe.sbt",
     scalaVersion := scala212,
-    libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
+    libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % "test",
     resourceGenerators in Compile += generateVersionFile.taskValue,
     scriptedDependencies := {
       scriptedDependencies.value
@@ -175,12 +177,6 @@ def generateVersionFile = Def.task {
   Seq(file)
 }
 
-// Dependencies
-
-def scalatest(scalaV: String): String = scalaV match {
-  case _ => "3.0.8"
-}
-
 def scalaCompiler(version: String) = "org.scala-lang" % "scala-compiler" % version
 
 def scalaParserCombinators(scalaVersion: String): Seq[ModuleID] = scalaVersion match {

diff --git a/compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala b/compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala
@@ -539,14 +539,13 @@ package """ :+ packageName :+ """
       val resp = PresentationCompiler.global
         .askForResponse { () =>
           val functionType = "(" + params
-            .map(
-              group =>
-                "(" + group
-                  .map {
-                    case ByNameParam(_, paramType) => " => " + paramType
-                    case a                         => filterType(a.tpt.toString)
-                  }
-                  .mkString(",") + ")"
+            .map(group =>
+              "(" + group
+                .map {
+                  case ByNameParam(_, paramType) => " => " + paramType
+                  case a                         => filterType(a.tpt.toString)
+                }
+                .mkString(",") + ")"
             )
             .mkString(" => ") + " => " + returnType + ")"
 
@@ -559,16 +558,15 @@ package """ :+ packageName :+ """
               .mkString(",") + ")",
             returnType,
             params
-              .map(
-                group =>
-                  "(" + group
-                    .map { p =>
-                      p.name.toString + Option(p.tpt.toString)
-                        .filter(_.startsWith("_root_.scala.<repeated>"))
-                        .map(_ => ".toIndexedSeq:_*")
-                        .getOrElse("")
-                    }
-                    .mkString(",") + ")"
+              .map(group =>
+                "(" + group
+                  .map { p =>
+                    p.name.toString + Option(p.tpt.toString)
+                      .filter(_.startsWith("_root_.scala.<repeated>"))
+                      .map(_ => ".toIndexedSeq:_*")
+                      .getOrElse("")
+                  }
+                  .mkString(",") + ")"
               )
               .mkString
           )
@@ -588,16 +586,15 @@ package """ :+ packageName :+ """
             functionType,
             params.map(group => "(" + group.map(_.name.toString).mkString(",") + ")").mkString(" => "),
             params
-              .map(
-                group =>
-                  "(" + group
-                    .map { p =>
-                      p.name.toString + Option(p.tpt.toString)
-                        .filter(_.startsWith("_root_.scala.<repeated>"))
-                        .map(_ => ".toIndexedSeq:_*")
-                        .getOrElse("")
-                    }
-                    .mkString(",") + ")"
+              .map(group =>
+                "(" + group
+                  .map { p =>
+                    p.name.toString + Option(p.tpt.toString)
+                      .filter(_.startsWith("_root_.scala.<repeated>"))
+                      .map(_ => ".toIndexedSeq:_*")
+                      .getOrElse("")
+                  }
+                  .mkString(",") + ")"
               )
               .mkString
           )

diff --git a/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala b/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala
@@ -6,12 +6,12 @@ package test
 
 import java.io._
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api.Html
 import play.twirl.parser.TwirlIO
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class CompilerSpec extends WordSpec with MustMatchers {
+class CompilerSpec extends AnyWordSpec with Matchers {
 
   import Helper._
 

diff --git a/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala b/compiler/src/test/scala/play/twirl/compiler/test/TemplateUtilsSpec.scala
@@ -4,13 +4,13 @@
 package play.twirl.compiler
 package test
 
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.api._
 
 import scala.collection.immutable
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplateUtilsSpec extends WordSpec with MustMatchers {
+class TemplateUtilsSpec extends AnyWordSpec with Matchers {
 
   "Templates" should {
 

diff --git a/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala b/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala
@@ -5,11 +5,11 @@ package play.twirl.parser
 package test
 
 import org.scalatest.Inside
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.parser.TreeNodes._
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class ParserSpec extends WordSpec with MustMatchers with Inside {
+class ParserSpec extends AnyWordSpec with Matchers with Inside {
 
   val parser = new TwirlParser(shouldParseInclusiveDot = false)
 

diff --git a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala
@@ -5,12 +5,12 @@ package play.twirl.sbt
 package test
 
 import org.scalatest.Inspectors
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
 import play.twirl.sbt.TemplateProblem.TemplateMapping
 import play.twirl.sbt.TemplateProblem.TemplateMapping.Location
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplateMappingSpec extends WordSpec with MustMatchers with Inspectors {
+class TemplateMappingSpec extends AnyWordSpec with Matchers with Inspectors {
 
   "TemplateMapping" should {
 

diff --git a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplatePositionSpec.scala
@@ -8,10 +8,10 @@ import java.io.File
 import play.twirl.sbt.TemplateProblem.TemplateMapping
 import play.twirl.sbt.TemplateProblem.TemplatePosition
 import org.scalatest.Inspectors
-import org.scalatest.MustMatchers
-import org.scalatest.WordSpec
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class TemplatePositionSpec extends WordSpec with MustMatchers with Inspectors {
+class TemplatePositionSpec extends AnyWordSpec with Matchers with Inspectors {
 
   "TemplatePosition" should {