Merge branch 'cheeseng-ExpectationsSpec-scala-js-fix' into 3.0.x

Author: bvenners

project/GenScalaTestJS.scala

@@ -252,7 +252,6 @@ object GenScalaTestJS {
         "StreamlinedXmlEqualitySpec.scala",    // skipped because use scala.xml
         "StreamlinedXmlNormMethodsSpec.scala", // skipped because use scala.xml
         "StreamlinedXmlSpec.scala",            // skipped because use scala.xml
-        "ExpectationsSpec.scala",            // skipped because currently doesn't link and I don't have time to fix TODO: Bring it back
         "SuiteSuite.scala"         // skipped because it depends on java reflection
       )) ++
     copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

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

@@ -496,15 +496,11 @@ class ExpectationsSpec extends FunSpec with Expectations {
 
       it("should return No with correct fact message when parse failed") {
         val fact = expectCompiles("println(\"test)")
-        // SKIP-SCALATESTJS-START
-        if (scala.util.Properties.versionString.contains("2.10"))
+        if (ScalaTestVersions.BuiltForScalaVersion == "2.10")
           assert(fact.factMessage == Resources.expectedNoErrorButGotParseError("reflective compilation has failed: \n\nunclosed string literal\n')' expected but eof found.", "println(\"test)"))
         else
           assert(fact.factMessage == Resources.expectedNoErrorButGotParseError("unclosed string literal", "println(\"test)"))
-        // SKIP-SCALATESTJS-END
 
-        //SCALATESTJS-ONLY assert(fact.factMessage.indexOf("unclosed string literal") >= 0)
-        //SCALATESTJS-ONLY assert(fact.factMessage.indexOf("println(\"test)") >= 0)
         assert(!fact.isVacuousYes)
       }
     }
@@ -556,7 +552,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
           )
         assert(fact.isInstanceOf[Fact.Leaf])
         assert(fact.isNo)
-        if (scala.util.Properties.versionString.contains("2.10"))
+        if (ScalaTestVersions.BuiltForScalaVersion == "2.10")
           assert(fact.factMessage == Resources.expectedNoErrorButGotParseError("reflective compilation has failed: \n\nunclosed string literal\n')' expected but '}' found.", "\nprintln(\"test)\n"))
         else
           assert(fact.factMessage == Resources.expectedNoErrorButGotParseError(
@@ -594,7 +590,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         val fact = expectTypeError("println(\"test)")
         assert(fact.isInstanceOf[Fact.Leaf])
         assert(fact.isNo)
-        if (scala.util.Properties.versionString.contains("2.10"))
+        if (ScalaTestVersions.BuiltForScalaVersion == "2.10")
           assert(fact.factMessage == Resources.expectedTypeErrorButGotParseError("reflective compilation has failed: \n\nunclosed string literal\n')' expected but eof found.", "println(\"test)"))
         else
           assert(fact.factMessage == Resources.expectedTypeErrorButGotParseError("unclosed string literal", "println(\"test)"))
@@ -648,7 +644,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
 
         assert(fact.isInstanceOf[Fact.Leaf])
         assert(fact.isNo)
-        if (scala.util.Properties.versionString.contains("2.10"))
+        if (ScalaTestVersions.BuiltForScalaVersion == "2.10")
           assert(fact.factMessage == Resources.expectedTypeErrorButGotParseError("reflective compilation has failed: \n\nunclosed string literal\n')' expected but '}' found.", "\nprintln(\"test)\n"))
         else
           assert(fact.factMessage == Resources.expectedTypeErrorButGotParseError(