Skip to content

Commit 33292c0

Browse files
committed
Bumping up scala-js version to 2.12.0-M5.
1 parent bb9984c commit 33292c0

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

project/GenScalaTestJS.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ object GenScalaTestJS {
263263
"StreamlinedXmlEqualitySpec.scala", // skipped because use scala.xml
264264
"StreamlinedXmlNormMethodsSpec.scala", // skipped because use scala.xml
265265
"StreamlinedXmlSpec.scala", // skipped because use scala.xml
266-
"SuiteSuite.scala" // skipped because it depends on java reflection
266+
"SuiteSuite.scala", // skipped because it depends on java reflection
267+
"MatchersSerializableSpec.scala" // skipped because testing java serialization
267268
)) ++
268269
copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
269270
List(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
22

33
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
44

5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.10")

project/scalatest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ object ScalatestBuild extends Build {
184184

185185
def scalatestJSLibraryDependencies =
186186
Seq(
187-
"org.scala-js" %% "scalajs-test-interface" % "0.6.9"
187+
"org.scala-js" %% "scalajs-test-interface" % "0.6.10"
188188
)
189189

190190
def scalatestTestOptions =
@@ -626,9 +626,9 @@ object ScalatestBuild extends Build {
626626
}.taskValue
627627
},
628628
sourceGenerators in Test <+=
629-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
629+
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest)/*,
630630
sourceGenerators in Test <+=
631-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)
631+
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
632632
).dependsOn(scalatestJS % "test", commonTestJS % "test").enablePlugins(ScalaJSPlugin)
633633

634634
lazy val scalatestApp = Project("scalatestApp", file("."))

scalatest-test/src/test/scala/org/scalatest/ShouldBeAnySpec.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,15 @@ class ShouldBeAnySpec extends FunSpec with Checkers with ReturnsNormallyThrowsAs
217217
}
218218
assert(e.message == Some("!!! test [1] !!! was not equal to !!! test [2] !!!"))
219219
}
220+
221+
// SKIP-SCALATESTJS-START
220222
it("should produce TestFailedExceptions that can be serialized") {
221223
import scala.util.Try
222224
val result = Try(1 shouldBe 2)
223225
val baos = new java.io.ByteArrayOutputStream
224226
val oos = new java.io.ObjectOutputStream(baos)
225227
oos.writeObject(result) // Should not throw an exeption
226228
}
229+
// SKIP-SCALATESTJS-END
227230
}
228231
}

0 commit comments

Comments
 (0)