Upgraded scala.js and scalatest libs

viktor-podzigun · viktor-podzigun · commit 901c5300f574 · 2021-05-31T22:53:25.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,37 +5,38 @@ jdk:
 dist: trusty
 env:
   global:
-  - TRAVIS_NODE_VERSION="8"
   - TRAVIS_SBT_VERSION="1.2.8"
   - secure: SVb4Odan6bePQ6v8BhAWYkW2JhHYiS4UojkmEZacEsobjgNAkI4qSGYjC8pcIvBUKnFPafHRG/ggtrZ8ml1beX9bXQxJsmGOutJEMuQyInPUDXdvUHABNBd/8NL8tJhZS6Ijnzbar6i78vizZNW88V9HpWwk2HZQyHw9q5mp1R0nHOG9L1474I62hnc/rclAPecWgUbiTft2mPXRohmb8aFhqAceYao+1g1LY4AuXyPiM3s4sU1YzdL/DJLWVbt8WUAmPUfiAKpGSQY98bBBxCfJrNDezIhENcY/MTo5+cGEcVtfJKu9psL5fShOPUChnnonHSb34/XWyocgN8ZrCQTfhqI1lIzB8HOc3nRiKwPfUcZ2MQ5P4fJi62rzfhEz8/r3HlvhKM+m1++wc7ocsb7+ku59xn93DWYkXKVkD2r3DnzaANd2FMFplopFSEgBJVGTKOXQSSVriMKeTpg2q13PvDhhUTIgOus4MX+n/q4XiAFLygCceRXq1mXFKi0sjWLrJkBldkg8VA1dL31RdK5ZN5K+56gSYPVhvOVeKx2URkbNDV3Y0z8rM33852VI7pdkRuGAZZFfKwVGOFlc5HcbLRln0e2oql1KtOWjyfFicT9pjHfeg2dfIrKBKMrJGavaLdh8kuX/0kKp37SdP+mJtVqJTwwoCXJol6tcl/s=
   - secure: IblLuw3rbTHi3Bozgz2h5IUaL9VfdLAdep4u95V4A/GGxR/nfXkfOuxT10c1+OrYc2+KxKDGChhlTvMd6HsHi5LUmPgfgB4MQMXs4OTsBDX3mMD4uSWbzBFyq/Z0YdbJxfQisJkseWDl7HWGuiAJyiRUdLkyEj3L9mtIqqHzsfN47V1mgAriilo+bDeLLmRrrCL9M+Y1B3fJnmcL2ptLwssZi2fcUoplmS7EjYcf0c0hYeGd3TcI6Qw31nQxRilH49Tlxp9RSWiV1IEQMBV3a7y14ttGZJ7erVXH5PxkYvSAHY54/l2LV1VoJUSO/AiiytuAMOhREpHAXoJh16dVg5kcerQnImbyflc93nU0FuPwo3jOZHtW4JaYJAUosnf1HnsSQZyfcYRuEgiTmrGTkI27ExJ6GmbVY9RyVyT20/72F7cES80Os71f3AMIIOTSfsSORVjXAxaDJCEzyez58uomO6qLJMwQKic4doac/FqIS9qd6OFWas1fEzUORpxu+z6TjwKQRld4Jr+PrNd9dARqtFpXb6MwsM9Di4jn9y9W7HKtaWfvPi1pVlPEFXVlewGM0ABWLoMnAmVdFr6bi/e85rvaUjvhL3ndm/fA1TKrY6ujKDL6PhDk+jAtH8DQ1+UcewfHRJDOtHcnUosjxep5kDQIL8ZEhAWcLAZXTZA=
   - secure: XvCmVFa89uD66HPY58fdE3CzDh6Z5ty2hjfj1eGa6AKTLFoBm81ZVCr4hEzyadKL/XxT6l3pt2nCBgJzfm5bOYC7hVS661mgPVw6Trl0t+vMhSo6z8NLVQTcatyvMBGUR0LowSbwVENT5DDuLbb14CWAzMOuO2IIopEYZbNo3j5+/6Phs/fxYwhjsCLy/IMSFnYUeuwJO1EmIrehthtfkpH3ewH7ADYu6QLrQfFfYc46drp56i5MrkgGJWcAMvCuyczV/bv48CoS6cgKaC7uF2MaqynEwqvoI8FtctTpcx1sQpwHJJGBHMkggq09Oi1C7T/uWu6NY3NemqETHi9vaKu+fzRlRAtvSOT02CwSszLFL6AukTJjtJbF4hsZdwuqCVjfa6rQcM56Xtw1/1uFpMh8Y3CqTAwITIShk02ppi/meDKxby5DFEuD0METtoYGEu7oZxRB/PZX0H6H+HmJpmPfbbgrZvQQOiTiUC+mgS2vCsQ+Zx/TWenLK9muj7YMFCJH1/PNdrNzqT74ic07dFjv9qBbVdNiLLrfLyVAhwilrkOCda+eGxmz94sTdfUggkw2Y4sgIg0vx6eyyXsac4Axi4ATuX2qhoQlRA+GmrqUsc/Se40/GnwPnJKmys0I5FB8EpQ/Wwq3CFgJ9353jFpbB0OcVcL4JskD8Mv/W1s=
 before_install:
-- nvm install 6
-- nvm use 6
-- node --version
+- nvm install 12 &&
+  nvm use 12
+- node --version &&
+  npm --version
 - if [ $TRAVIS_PULL_REQUEST = 'false' ]; then
     openssl aes-256-cbc -K $encrypted_76f871b6a7fb_key -iv $encrypted_76f871b6a7fb_iv -in travis/secrets.tar.enc -out travis/secrets.tar -d;
     tar xv -C travis -f travis/secrets.tar;
   fi
 script:
 - sbt clean coverage test coverageReport &&
-  sbt coverageAggregate
-after_success:
-- sbt coveralls
-- if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" -o "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]; then
+  sbt coverageAggregate &&
+  sbt coveralls &&
+  if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" -o "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]; then
     if [ -z "$TRAVIS_TAG" ]; then
        echo "Publish a snapshot";
        sbt clean publish;
     else
        echo "Publish a release version=$TRAVIS_TAG";
-       version=$TRAVIS_TAG sbt clean publishSigned sonatypeRelease;
+       version=$TRAVIS_TAG sbt clean publishSigned sonatypeBundleRelease;
     fi
   else
     echo "This is not a master branch commit. Skipping the publish/release step";
   fi
 cache:
   directories:
+  - ~/.npm
+  - ~/.nvm
   - "$HOME/.ivy2/cache"
   - "$HOME/.sbt"
 before_cache:
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.com/scommons/scommons-api.svg?branch=master)](https://travis-ci.com/scommons/scommons-api)
 [![Coverage Status](https://coveralls.io/repos/github/scommons/scommons-api/badge.svg?branch=master)](https://coveralls.io/github/scommons/scommons-api?branch=master)
 [![scala-index](https://index.scala-lang.org/scommons/scommons-api/scommons-api-core/latest.svg)](https://index.scala-lang.org/scommons/scommons-api/scommons-api-core)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.17.svg)](https://www.scala-js.org)
+[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org)
 
 ## scommons-api
 Common REST API Scala/Scala.js components
diff --git a/admin/shared/src/test/scala/scommons/api/admin/permission/PermissionNodeSpec.scala b/admin/shared/src/test/scala/scommons/api/admin/permission/PermissionNodeSpec.scala
@@ -1,9 +1,10 @@
 package scommons.api.admin.permission
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import scommons.api.admin.permission.PermissionNodeSpec._
 
-class PermissionNodeSpec extends FlatSpec with Matchers {
+class PermissionNodeSpec extends AnyFlatSpec with Matchers {
 
   it should "fail to create new PermissionNode if name is empty" in {
     //when
diff --git a/admin/shared/src/test/scala/scommons/api/admin/permission/PermissionSpec.scala b/admin/shared/src/test/scala/scommons/api/admin/permission/PermissionSpec.scala
@@ -1,8 +1,9 @@
 package scommons.api.admin.permission
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class PermissionSpec extends FlatSpec with Matchers {
+class PermissionSpec extends AnyFlatSpec with Matchers {
 
   it should "fail to create new Permission if name is empty" in {
     //when
diff --git a/core/src/test/scala/scommons/api/ApiStatusSpec.scala b/core/src/test/scala/scommons/api/ApiStatusSpec.scala
@@ -1,8 +1,9 @@
 package scommons.api
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class ApiStatusSpec extends FlatSpec with Matchers {
+class ApiStatusSpec extends AnyFlatSpec with Matchers {
 
   it should "return successful status" in {
     //when
diff --git a/core/src/test/scala/scommons/api/StatusResponseSpec.scala b/core/src/test/scala/scommons/api/StatusResponseSpec.scala
@@ -1,8 +1,9 @@
 package scommons.api
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class StatusResponseSpec extends FlatSpec with Matchers {
+class StatusResponseSpec extends AnyFlatSpec with Matchers {
 
   it should "return successful status" in {
     //when & then
diff --git a/core/src/test/scala/scommons/api/http/ApiHttpClientSpec.scala b/core/src/test/scala/scommons/api/http/ApiHttpClientSpec.scala
@@ -1,7 +1,9 @@
 package scommons.api.http
 
 import org.scalamock.scalatest.AsyncMockFactory
-import org.scalatest.{AsyncFlatSpec, Inside, Matchers}
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.Inside
+import org.scalatest.matchers.should.Matchers
 import play.api.libs.json.Json.{stringify, toJson}
 import play.api.libs.json._
 import scommons.api.http.ApiHttpClient._
diff --git a/joda-time/js/src/test/scala/org/joda/time/DateTimeSpec.scala b/joda-time/js/src/test/scala/org/joda/time/DateTimeSpec.scala
@@ -1,10 +1,11 @@
 package org.joda.time
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.scalajs.js
 
-class DateTimeSpec extends FlatSpec with Matchers {
+class DateTimeSpec extends AnyFlatSpec with Matchers {
 
   it should "fail if DateTime value is not ISO8601 time formatted string" in {
     //given
diff --git a/joda-time/js/src/test/scala/org/joda/time/LocalDateSpec.scala b/joda-time/js/src/test/scala/org/joda/time/LocalDateSpec.scala
@@ -1,10 +1,11 @@
 package org.joda.time
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.scalajs.js
 
-class LocalDateSpec extends FlatSpec with Matchers {
+class LocalDateSpec extends AnyFlatSpec with Matchers {
 
   it should "fail if LocalDate value is not ISO8601 time formatted string" in {
     //given
diff --git a/joda-time/js/src/test/scala/org/joda/time/LocalTimeSpec.scala b/joda-time/js/src/test/scala/org/joda/time/LocalTimeSpec.scala
@@ -1,10 +1,11 @@
 package org.joda.time
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.scalajs.js
 
-class LocalTimeSpec extends FlatSpec with Matchers {
+class LocalTimeSpec extends AnyFlatSpec with Matchers {
 
   it should "fail if LocalTime value is not ISO8601 time formatted string" in {
     //given
diff --git a/joda-time/shared/src/test/scala/scommons/api/jodatime/JodaTimeImplicitsSpec.scala b/joda-time/shared/src/test/scala/scommons/api/jodatime/JodaTimeImplicitsSpec.scala
@@ -1,11 +1,12 @@
 package scommons.api.jodatime
 
 import org.joda.time.{DateTime, LocalDate, LocalTime}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import play.api.libs.json._
 import scommons.api.jodatime.JodaTimeImplicitsSpec._
 
-class JodaTimeImplicitsSpec extends FlatSpec with Matchers {
+class JodaTimeImplicitsSpec extends AnyFlatSpec with Matchers {
 
   private val expectedData = TestData(
     firstName = "John",
diff --git a/pgp.sbt b/pgp.sbt
@@ -1,7 +1,6 @@
 
 //see: https://www.scala-sbt.org/sbt-pgp/usage.html
 
-useGpg := false
 pgpPublicRing := file("./travis/pubring.gpg")
 pgpSecretRing := file("./travis/secring.gpg")
 pgpPassphrase := sys.env.get("PGP_PASS").map(_.toArray)
diff --git a/play-ws/src/test/scala/scommons/api/http/ws/WsApiHttpClientSpec.scala b/play-ws/src/test/scala/scommons/api/http/ws/WsApiHttpClientSpec.scala
@@ -7,21 +7,24 @@ import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
 import akka.util.ByteString
 import org.mockito.ArgumentCaptor
-import org.mockito.Matchers.any
+import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito._
+import org.mockito.stubbing.Stubber
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.mockito.MockitoSugar
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.time.{Millis, Seconds, Span}
-import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FlatSpec, Matchers}
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+import org.scalatestplus.mockito.MockitoSugar
 import play.api.libs.ws.ahc.StandaloneAhcWSClient
 import play.api.libs.ws.{EmptyBody, InMemoryBody, StandaloneWSRequest, StandaloneWSResponse}
 import scommons.api.http.ApiHttpData.{StringData, UrlEncodedFormData}
 import scommons.api.http.{ApiHttpData, ApiHttpResponse}
 
-import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.duration._
+import scala.concurrent.{ExecutionContext, Future}
 
-class WsApiHttpClientSpec extends FlatSpec
+class WsApiHttpClientSpec extends AnyFlatSpec
   with Matchers
   with BeforeAndAfterAll
   with BeforeAndAfterEach
@@ -178,7 +181,7 @@ class WsApiHttpClientSpec extends FlatSpec
     //given
     val targetUrl = s"$baseUrl/api/get/url"
 
-    doReturn(Future.failed(new TimeoutException()))
+    doReturnSafe(Future.failed(new TimeoutException()))
       .when(client).execute(any[StandaloneWSRequest])
 
     //when
@@ -189,7 +192,7 @@ class WsApiHttpClientSpec extends FlatSpec
 
     assertRequest("GET", targetUrl, params, headers, None, timeout)
 
-    verifyZeroInteractions(response)
+    verifyNoInteractions(response)
   }
   
   private def assertApiHttpResponse(result: ApiHttpResponse, expected: ApiHttpResponse): Unit = {
@@ -207,7 +210,8 @@ class WsApiHttpClientSpec extends FlatSpec
                             body: Option[ApiHttpData],
                             timeout: FiniteDuration): Unit = {
 
-    val reqCaptor = ArgumentCaptor.forClass(classOf[StandaloneWSRequest])
+    val reqCaptor: ArgumentCaptor[StandaloneWSRequest] =
+      ArgumentCaptor.forClass(classOf[StandaloneWSRequest])
     verify(client).execute(reqCaptor.capture())
 
     val req = reqCaptor.getValue
@@ -236,4 +240,6 @@ class WsApiHttpClientSpec extends FlatSpec
         }
     }
   }
+
+  private def doReturnSafe(any: Any, more: AnyRef*): Stubber = doReturn(any, more: _*)
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,4 @@
 //resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-//use patched versions by now, to make scoverage work with scalajs-bundler
-addSbtPlugin(("org.scommons.patched" % "sbt-scalajs-bundler" % "0.14.0-SNAPSHOT").force())
-
-addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "1.0.0-SNAPSHOT").changing())
+addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.4.0-SNAPSHOT").changing())
diff --git a/project/src/main/scala/definitions/ApiModule.scala b/project/src/main/scala/definitions/ApiModule.scala
@@ -26,12 +26,7 @@ object ApiModule {
     sonatypeProfileName := "org.scommons",
     publishMavenStyle := true,
     publishArtifact in Test := false,
-    publishTo := {
-      if (isSnapshot.value)
-        Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
-      else
-        Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
-    },
+    publishTo := sonatypePublishToBundle.value,
     pomExtra := {
       <url>https://github.com/scommons/scommons-api</url>
         <licenses>
diff --git a/project/src/main/scala/definitions/ApiPlayWs.scala b/project/src/main/scala/definitions/ApiPlayWs.scala
@@ -25,6 +25,6 @@ object ApiPlayWs extends ApiModule {
 
   override val testDependencies: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq(
     TestLibs.scalaTest.value,
-    TestLibs.mockito.value
+    TestLibs.scalaTestPlusMockito.value
   ).map(_ % "test"))
 }
diff --git a/xhr/src/test/scala/scommons/api/http/xhr/XhrApiHttpClientSpec.scala b/xhr/src/test/scala/scommons/api/http/xhr/XhrApiHttpClientSpec.scala
@@ -1,7 +1,9 @@
 package scommons.api.http.xhr
 
 import org.scalamock.scalatest.AsyncMockFactory
-import org.scalatest.{Assertion, AsyncFlatSpec, Inside, Matchers}
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.{Assertion, Inside}
 import scommons.api.http.ApiHttpData.{StringData, UrlEncodedFormData}
 import scommons.api.http.xhr.XhrApiHttpClient._
 import scommons.api.http.xhr.XhrApiHttpClientSpec.MockXMLHttpRequest
