Fixed failing tests when built with Scala-js 1.0.0.

Author: cheeseng

project/JsBuild.scala

@@ -14,7 +14,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 
 trait JsBuild { this: BuildCommons =>
 
-  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
+  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
 
   lazy val deleteJsDependenciesTask = taskKey[Unit]("Delete JS_DEPENDENCIES")
 

project/plugins.sbt

@@ -4,7 +4,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 

publish.sh

@@ -1,8 +1,8 @@
 sbt clean
 sbt "project scalactic" clean +publishSigned
-export SCALAJS_VERSION=0.6.31
+export SCALAJS_VERSION=0.6.32
 sbt "project scalacticJS" clean +publishSigned
-export SCALAJS_VERSION=1.0.0-RC2
+export SCALAJS_VERSION=1.0.0
 sbt ++2.11.12 "project scalacticJS" clean publishSigned
 sbt ++2.12.10 "project scalacticJS" clean publishSigned
 sbt ++2.13.1 "project scalacticJS" clean publishSigned
@@ -13,9 +13,9 @@ sbt "project scalactic" sonatypeBundleUpload
 sbt clean
 sbt scalatestCompatible/clean scalatestCompatible/publishSigned
 sbt "project scalatest" clean +publishSigned
-export SCALAJS_VERSION=0.6.31
+export SCALAJS_VERSION=0.6.32
 sbt "project scalatestJS" clean +publishSigned
-export SCALAJS_VERSION=1.0.0-RC2
+export SCALAJS_VERSION=1.0.0
 sbt ++2.11.12 "project scalatestJS" clean publishSigned
 sbt ++2.12.10 "project scalatestJS" clean publishSigned
 sbt ++2.13.1 "project scalatestJS" clean publishSigned
@@ -24,9 +24,9 @@ sbt "project scalatestDotty" clean publishSigned
 
 sbt clean
 sbt "project scalatestApp" clean +publishSigned
-export SCALAJS_VERSION=0.6.31
+export SCALAJS_VERSION=0.6.32
 sbt "project scalatestAppJS" clean +publishSigned
-export SCALAJS_VERSION=1.0.0-RC2
+export SCALAJS_VERSION=1.0.0
 sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
 sbt ++2.12.10 "project scalatestAppJS" clean publishSigned
 sbt ++2.13.1 "project scalatestAppJS" clean publishSigned

scalactic.js/src/main/scala/org/scalactic/source/ObjectMeta.scala

@@ -55,14 +55,23 @@ object ObjectMeta {
           replaceAllLiterally("$$und", "_").
           replaceAllLiterally("$mcI", "").
           replaceAllLiterally("$sp", "").
-          replaceAllLiterally("$f", "")
-
-      Some((filterDollarNumberAtTheEnd(decodedKey), value))
+          replaceAllLiterally("$f", "").
+          replace(".*__f_", "")  // For scala-js 1.0
+
+      val decodedKey10 = {
+        val idx = decodedKey.indexOf("__f_")
+        if (idx >= 0)
+          decodedKey.drop(idx + 4)
+        else
+          decodedKey
+      }    
+
+      Some((filterDollarNumberAtTheEnd(decodedKey10), value))
     }.flatten.toMap
 
     new ObjectMeta {
 
-      lazy val fieldNames = dict.keys.toVector.filter(_ != "$$outer")
+      lazy val fieldNames = dict.keys.toVector.filter(k => k != "$$outer" && k != "$outer")
 
       def value(name: String): Any = {
         dict.get(name) match {