Skip to content

Commit e5bbd14

Browse files
committed
Scala.js test is working again
1 parent 61be139 commit e5bbd14

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

plugin/src/test/scala/scoverage/PluginCoverageScalaJsTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import munit.FunSuite
77
class PluginCoverageScalaJsTest extends FunSuite with MacroSupport {
88

99
test("scoverage should ignore default undefined parameter") {
10-
val compiler = ScoverageCompiler.default
10+
val compiler = ScoverageCompiler.defaultJS
1111
compiler.compileCodeSnippet(
1212
"""import scala.scalajs.js
1313
|

plugin/src/test/scala/scoverage/ScoverageCompiler.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private[scoverage] object ScoverageCompiler {
5555
new ScoverageCompiler(settings, reporter)
5656
}
5757

58-
def defaultScalaJs: ScoverageCompiler = {
58+
def defaultJS: ScoverageCompiler = {
5959
val reporter = new scala.tools.nsc.reporters.ConsoleReporter(jsSettings)
6060
new ScoverageCompiler(jsSettings, reporter)
6161
}
@@ -71,17 +71,15 @@ private[scoverage] object ScoverageCompiler {
7171
}
7272

7373
private def getScalaJsJars: List[File] = {
74-
List(
75-
findJar("org.scala-lang", "scala-compiler", ScalaVersion),
76-
findJar("org.scala-lang", "scala-reflect", ScalaVersion),
74+
getScalaJars ++ List(
7775
findJar(
7876
"org.scala-js",
7977
s"scalajs-compiler_$ScalaVersion",
8078
BuildInfo.scalaJSVersion
8179
),
8280
findJar(
8381
"org.scala-js",
84-
s"scalajs-library_$ScalaVersion",
82+
s"scalajs-library_$ShortScalaVersion",
8583
BuildInfo.scalaJSVersion
8684
)
8785
)

0 commit comments

Comments
 (0)