Merge branch 'cheeseng-feature-macrotask-executor'

scalatest · Sep 27, 2023 · edda9c5 · edda9c5
2 parents 8f767ec + 5523f29
commit edda9c5
Show file tree

Hide file tree

Showing 61 changed files with 581 additions and 100 deletions.
diff --git a/js/core/src/main/scala/org/scalatest/tools/TaskRunner.scala b/js/core/src/main/scala/org/scalatest/tools/TaskRunner.scala
@@ -33,7 +33,6 @@ import scala.concurrent.Promise
 import scala.concurrent.Future
 import scala.concurrent.Await
 import scala.util.Success
-import scala.scalajs.concurrent.JSExecutionContext
 
 import scala.compat.Platform
 import scala.concurrent.duration.Duration
@@ -61,10 +60,9 @@ final class TaskRunner(task: TaskDef,
   def taskDef(): TaskDef = task
 
   def execute(eventHandler: EventHandler, loggers: Array[Logger], continuation: (Array[Task]) => Unit): Unit = {
-    implicit val execCtx = JSExecutionContext.queue
+    import org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits._
     val future = executionFuture(eventHandler, loggers)
     future.recover { case t =>
-println("GOT TO THIS RECOVER CALL")
       loggers.foreach(_.trace(t))
     }.onComplete{ _ =>
       continuation(Array.empty)

diff --git a/jvm/core/src/main/scala/org/scalatest/AsyncTestSuite.scala b/jvm/core/src/main/scala/org/scalatest/AsyncTestSuite.scala
@@ -213,12 +213,13 @@ import enablers.Futuristic
  */
 trait AsyncTestSuite extends Suite with RecoverMethods with CompleteLastly { thisAsyncTestSuite =>
 
+  private final val serialExecutionContext: ExecutionContext = new concurrent.SerialExecutionContext
+
   /**
    * An implicit execution context used by async styles to transform <code>Future[Assertion]</code> values
    * returned by tests into <code>FutureOutcome</code> values, and can be used within the async tests themselves,
    * for example, when mapping assertions onto futures.
    */
-  private final val serialExecutionContext: ExecutionContext = new concurrent.SerialExecutionContext
   implicit def executionContext: ExecutionContext = serialExecutionContext
 
   private def anAsyncExceptionThatShouldCauseAnAbort(ex: Throwable): Boolean =

diff --git a/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecLikeSpec.scala b/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecLikeSpec.scala
@@ -1048,11 +1048,27 @@ class AsyncFeatureSpecLikeSpec extends funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
+
       class TestSpec extends AsyncFeatureSpecLike {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
         val a = 1
         Feature("feature 1") {
           Scenario("scenario A") {
@@ -1081,6 +1097,7 @@ class AsyncFeatureSpecLikeSpec extends funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
 
   }

diff --git a/...featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecLikeSpec2.scala b/...featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecLikeSpec2.scala
@@ -30,6 +30,8 @@ import org.scalatest.Succeeded
 
 class FixtureAsyncFeatureSpecLikeSpec2 extends funspec.AsyncFunSpec {
 
+  //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
+
   describe("AsyncFeatureSpecLike") {
 
     // ParallelTestExecution not working yet.
@@ -859,7 +861,7 @@ class FixtureAsyncFeatureSpecLikeSpec2 extends funspec.AsyncFunSpec {
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
         val a = 1
         Feature("feature 1") {
           Scenario("scenario A") {

diff --git a/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecSpec.scala b/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecSpec.scala
@@ -877,11 +877,25 @@ class FixtureAsyncFeatureSpecSpec extends funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
       class TestSpec extends AsyncFeatureSpecLike {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
         val a = 1
         Feature("feature 1") {
           Scenario("scenario A") {
@@ -910,6 +924,7 @@ class FixtureAsyncFeatureSpecSpec extends funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
   }
 }
diff --git a/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecSpec2.scala b/jvm/featurespec-test/src/test/scala/org/scalatest/featurespec/AsyncFeatureSpecSpec2.scala
@@ -30,6 +30,8 @@ import org.scalatest.Succeeded
 
 class FixtureAsyncFeatureSpecSpec2 extends funspec.AsyncFunSpec {
 
+  //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
+
   describe("AsyncFeatureSpec") {
 
     // ParallelTestExecution not working yet.
@@ -856,7 +858,7 @@ class FixtureAsyncFeatureSpecSpec2 extends funspec.AsyncFunSpec {
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
         val a = 1
         Feature("feature 1") {
           Scenario("scenario A") {

diff --git a/...ec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecLikeSpec.scala b/...ec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecLikeSpec.scala
@@ -958,11 +958,25 @@ class DeprecatedAsyncFeatureSpecLikeSpec extends scalatest.funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
       class TestSpec extends featurespec.FixtureAsyncFeatureSpecLike {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =
@@ -996,6 +1010,7 @@ class DeprecatedAsyncFeatureSpecLikeSpec extends scalatest.funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
 
   }

diff --git a/...c-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecLikeSpec2.scala b/...c-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecLikeSpec2.scala
@@ -26,6 +26,8 @@ import org.scalatest
 
 class DeprecatedAsyncFeatureSpecLikeSpec2 extends scalatest.funspec.AsyncFunSpec {
 
+  //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
+
   describe("AsyncFeatureSpecLike") {
 
     it("can be used for tests that return Future under parallel async test execution") {
@@ -945,7 +947,7 @@ class DeprecatedAsyncFeatureSpecLikeSpec2 extends scalatest.funspec.AsyncFunSpec
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =

diff --git a/...respec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecSpec.scala b/...respec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecSpec.scala
@@ -958,11 +958,25 @@ class DeprecatedAsyncFeatureSpecSpec extends scalatest.funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
       class TestSpec extends featurespec.FixtureAsyncFeatureSpec {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =
@@ -996,6 +1010,7 @@ class DeprecatedAsyncFeatureSpecSpec extends scalatest.funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
 
   }

diff --git a/...espec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecSpec2.scala b/...espec-test/src/test/scala/org/scalatest/featurespec/DeprecatedAsyncFeatureSpecSpec2.scala
@@ -952,7 +952,7 @@ class DeprecatedAsyncFeatureSpecSpec2 extends scalatest.funspec.AsyncFunSpec {
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        // SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =

diff --git a/...espec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLikeSpec.scala b/...espec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLikeSpec.scala
@@ -958,11 +958,25 @@ class FixtureAsyncFeatureSpecLikeSpec extends scalatest.funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
       class TestSpec extends featurespec.FixtureAsyncFeatureSpecLike {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =
@@ -996,6 +1010,7 @@ class FixtureAsyncFeatureSpecLikeSpec extends scalatest.funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
 
   }

diff --git a/...spec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLikeSpec2.scala b/...spec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLikeSpec2.scala
@@ -27,6 +27,8 @@ import org.scalatest.featurespec
 
 class AsyncFeatureSpecLikeSpec2 extends scalatest.funspec.AsyncFunSpec {
 
+  //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
+
   describe("AsyncFeatureSpecLike") {
 
     it("can be used for tests that return Future under parallel async test execution") {
@@ -946,7 +948,7 @@ class AsyncFeatureSpecLikeSpec2 extends scalatest.funspec.AsyncFunSpec {
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS-ONLY override implicit val executionContext: ExecutionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =

diff --git a/...aturespec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecSpec.scala b/...aturespec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecSpec.scala
@@ -958,11 +958,25 @@ class AsyncFeatureSpecSpec extends scalatest.funspec.AnyFunSpec {
     }
 
     it("should allow other execution context to be used") {
+      //SCALATESTJS,NATIVE-ONLY var changeMe = false
+
+      //SCALATESTJS,NATIVE-ONLY object CustomTestExecutionContext extends scala.concurrent.ExecutionContextExecutor {
+      //SCALATESTJS,NATIVE-ONLY   override def execute(runnable: Runnable): Unit = {
+      //SCALATESTJS,NATIVE-ONLY     changeMe = true
+      //SCALATESTJS,NATIVE-ONLY     try {
+      //SCALATESTJS,NATIVE-ONLY       runnable.run()
+      //SCALATESTJS,NATIVE-ONLY     } catch {
+      //SCALATESTJS,NATIVE-ONLY       case t: Throwable => reportFailure(t)
+      //SCALATESTJS,NATIVE-ONLY     }
+      //SCALATESTJS,NATIVE-ONLY   }
+      //SCALATESTJS,NATIVE-ONLY   def reportFailure(t: Throwable): Unit =
+      //SCALATESTJS,NATIVE-ONLY     t.printStackTrace()
+      //SCALATESTJS,NATIVE-ONLY }
       class TestSpec extends featurespec.FixtureAsyncFeatureSpec {
         // SKIP-SCALATESTJS,NATIVE-START
-        override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+        override implicit val executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS,NATIVE-ONLY override implicit val executionContext: ExecutionContext = CustomTestExecutionContext
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =
@@ -996,6 +1010,7 @@ class AsyncFeatureSpecSpec extends scalatest.funspec.AnyFunSpec {
       assert(reporter.scopeClosedEventsReceived.length == 3)
       assert(reporter.testStartingEventsReceived.length == 3)
       assert(reporter.testSucceededEventsReceived.length == 3)
+      //SCALATESTJS,NATIVE-ONLY assert(changeMe)
     }
 
   }

diff --git a/...turespec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecSpec2.scala b/...turespec-test/src/test/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecSpec2.scala
@@ -27,6 +27,8 @@ import org.scalatest.featurespec
 
 class AsyncFeatureSpecSpec2 extends scalatest.funspec.AsyncFunSpec {
 
+  //SCALATESTJS-ONLY override implicit val executionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
+
   describe("AsyncFeatureSpec") {
 
     it("can be used for tests that return Future under parallel async test execution") {
@@ -952,7 +954,7 @@ class AsyncFeatureSpecSpec2 extends scalatest.funspec.AsyncFunSpec {
         // SKIP-SCALATESTJS,NATIVE-START
         override implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
         // SKIP-SCALATESTJS,NATIVE-END
-        // SCALATESTJS-ONLY override implicit val executionContext = scala.scalajs.concurrent.JSExecutionContext.runNow
+        //SCALATESTJS-ONLY override implicit val executionContext = org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits.global
 
         type FixtureParam = String
         def withFixture(test: OneArgAsyncTest): FutureOutcome =