From 13df06c7af6cbd739961616ee1db6af4c7638bc8 Mon Sep 17 00:00:00 2001
From: asmirnova <asmirnova@playtika.com>
Date: Mon, 2 Aug 2021 18:20:21 +0300
Subject: [PATCH 1/3] Selenium: increase default startup timeout to 60 seconds

---
 .../containers/BrowserWebDriverContainer.java | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 1209b7af019..9890a93d8f7 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -77,14 +77,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     public BrowserWebDriverContainer() {
         super();
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
-                .withStartupTimeout(Duration.of(15, SECONDS));
-
-        this.waitStrategy = new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
@@ -106,14 +99,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
 
         // we assert compatibility with the chrome/firefox image later, after capabilities are processed
 
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-                .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
-                .withStartupTimeout(Duration.of(15, SECONDS));
-
-        this.waitStrategy = new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
 
@@ -383,6 +369,17 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
         return self();
     }
 
+    private WaitStrategy getDefaultWaitStrategy() {
+        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
+            .withStartupTimeout(Duration.of(60, SECONDS));
+
+        return new WaitAllStrategy()
+            .withStrategy(logWaitStrategy)
+            .withStrategy(new HostPortWaitStrategy())
+            .withStartupTimeout(Duration.of(60, SECONDS));
+    }
+
     public enum VncRecordingMode {
         SKIP, RECORD_ALL, RECORD_FAILING
     }

From abfb479855c0dd5f69ab4d323a713c9a75287b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 28 Nov 2023 14:40:39 -0600
Subject: [PATCH 2/3] Apply suggestions from code review

---
 .../testcontainers/containers/BrowserWebDriverContainer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 08d52c44f9e..11dc53abcbc 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -437,12 +437,12 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
     private WaitStrategy getDefaultWaitStrategy() {
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
             .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
-            .withStartupTimeout(Duration.of(60, SECONDS));
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
 
         return new WaitAllStrategy()
             .withStrategy(logWaitStrategy)
             .withStrategy(new HostPortWaitStrategy())
-            .withStartupTimeout(Duration.of(60, SECONDS));
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
     }
 
     public enum VncRecordingMode {

From d28947d3ef83536825e44c85a11287cf21913e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 28 Nov 2023 14:47:36 -0600
Subject: [PATCH 3/3] Fix format

---
 .../testcontainers/containers/BrowserWebDriverContainer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 11dc53abcbc..8cdb6ca611c 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -103,7 +103,6 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     public BrowserWebDriverContainer() {
         super();
-
         this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
@@ -436,7 +435,9 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
 
     private WaitStrategy getDefaultWaitStrategy() {
         final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
             .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
 
         return new WaitAllStrategy()