From dd032f6d2fd737a911294f76c15836a3282a1280 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Tue, 27 Aug 2024 14:16:55 -0400
Subject: [PATCH] Change default JS timeout to 5s

---
 .../buildsupport/RedwoodBuildExtension.kt     | 22 ++++++++++++++-----
 redwood-leak-detector/build.gradle            |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildExtension.kt b/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildExtension.kt
index 5d51036d20..5bafe5d3f2 100644
--- a/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildExtension.kt
+++ b/build-support/src/main/kotlin/app/cash/redwood/buildsupport/RedwoodBuildExtension.kt
@@ -93,11 +93,23 @@ enum class JsTests : TargetModifier {
 
   fun applyTo(dsl: KotlinJsTargetDsl) {
     when (this) {
-      Browser -> dsl.browser()
-      NodeJs -> dsl.nodejs()
-      Both -> dsl.apply {
-        browser()
-        nodejs()
+      Browser -> dsl.browser {
+        testTask {
+          it.useMocha {
+            timeout = "5s"
+          }
+        }
+      }
+      NodeJs -> dsl.nodejs {
+        testTask {
+          it.useMocha {
+            timeout = "5s"
+          }
+        }
+      }
+      Both -> {
+        Browser.applyTo(dsl)
+        NodeJs.applyTo(dsl)
       }
     }
   }
diff --git a/redwood-leak-detector/build.gradle b/redwood-leak-detector/build.gradle
index 2a0ce94910..0f23a66b8b 100644
--- a/redwood-leak-detector/build.gradle
+++ b/redwood-leak-detector/build.gradle
@@ -11,7 +11,7 @@ kotlin {
       testTask {
         useMocha {
           // We use up to 10s of wall clock time to test leaks. Add extra time for slow CI machines.
-          timeout = '30s'
+          timeout = '15s'
           // Required for access to V8 GC function.
           nodeJsArgs.add('--expose-gc')
         }