sueka
diff --git a/‎Jenkinsfile
Lines changed: 2 additions & 2 deletions b/‎Jenkinsfile
Lines changed: 2 additions & 2 deletions
diff --git a/‎junit-test/shared/src/test/scala/org/scalajs/junit/AsyncTest.scala
Lines changed: 6 additions & 9 deletions b/‎junit-test/shared/src/test/scala/org/scalajs/junit/AsyncTest.scala
Lines changed: 6 additions & 9 deletions
diff --git a/‎junit-test/shared/src/test/scala/org/scalajs/junit/utils/JUnitTest.scala
Lines changed: 2 additions & 2 deletions b/‎junit-test/shared/src/test/scala/org/scalajs/junit/utils/JUnitTest.scala
Lines changed: 2 additions & 2 deletions
@@ -146,8 +146,8 @@ def Tasks = [
   "test-suite-ecma-script2015": '''
     setJavaVersion $java
     npm install &&
-    sbtretry ++$scala jUnitTestOutputsJVM/test jUnitTestOutputsJS/test \
-        'set scalaJSStage in Global := FullOptStage' jUnitTestOutputsJS/test &&
+    sbtretry ++$scala jUnitTestOutputsJVM/test jUnitTestOutputsJS/test testBridge/test \
+        'set scalaJSStage in Global := FullOptStage' jUnitTestOutputsJS/test testBridge/test &&
     sbtretry ++$scala $testSuite/test &&
     sbtretry 'set scalaJSStage in Global := FullOptStage' \
         ++$scala $testSuite/test \
 
@@ -23,23 +23,20 @@ import org.scalajs.junit.async._
 
 class AsyncTest {
   @Test
-  def success(): AsyncResult = {
-    val res = Future(1 + 1).filter(_ == 2)
-    await(res)
+  def success(): AsyncResult = await {
+    Future(1 + 1).filter(_ == 2)
   }
 
   @Test(expected = classOf[IllegalArgumentException])
-  def expectedException(): AsyncResult = {
+  def expectedException(): AsyncResult = await {
     // Do not throw synchronously.
-    val res = Future.failed(new IllegalArgumentException)
-    await(res)
+    Future.failed(new IllegalArgumentException)
   }
 
   @Test
-  def asyncFailure(): AsyncResult = {
+  def asyncFailure(): AsyncResult = await {
     // Do not throw synchronously.
-    val res = Future.failed(new IllegalArgumentException)
-    await(res)
+    Future.failed(new IllegalArgumentException)
   }
 }
 
 
@@ -55,7 +55,7 @@ abstract class JUnitTest {
       List('v', 's', 'n')
   )
 
-  @Test def testJUnitOutput(): AsyncResult = {
+  @Test def testJUnitOutput(): AsyncResult = await {
     val futs = for (args <- frameworkArgss) yield {
       for {
         rawOut <- runTests(args.map("-" + _))
@@ -78,7 +78,7 @@ abstract class JUnitTest {
       }
     }
 
-    await(Future.sequence(futs).map(_ => ()))
+    Future.sequence(futs).map(_ => ())
   }
 
   private def runTests(args: List[String]): Future[List[Output]] = {
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ abstract class JUnitTest {`
`55`	`55`	`List('v', 's', 'n')`
`56`	`56`	`)`
`57`	`57`
`58`		`- @Test def testJUnitOutput(): AsyncResult = {`
	`58`	`+ @Test def testJUnitOutput(): AsyncResult = await {`
`59`	`59`	`val futs = for (args <- frameworkArgss) yield {`
`60`	`60`	`for {`
`61`	`61`	`rawOut <- runTests(args.map("-" + _))`
`@@ -78,7 +78,7 @@ abstract class JUnitTest {`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- await(Future.sequence(futs).map(_ => ()))`
	`81`	`+ Future.sequence(futs).map(_ => ())`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`private def runTests(args: List[String]): Future[List[Output]] = {`