From b7ae4a2a4019e1a11ff16342fdc2be6724ca7ec9 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 4 Sep 2026 15:02:20 +0200
Subject: [PATCH] openvidu-test-e2e: fix selenium findElement failure condition

---
 .../main/java/io/openvidu/test/e2e/OpenViduEventManager.java  | 4 +++-
 .../io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduEventManager.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduEventManager.java
index 015c04b6d..9200010ee 100644
--- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduEventManager.java
+++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduEventManager.java
@@ -144,7 +144,9 @@ public class OpenViduEventManager {
 	public void stopPolling(boolean stopThread, boolean cleanExistingEvents) {
 		if (stopThread) {
 			this.isInterrupted.set(true);
-			this.pollingThread.interrupt();
+			if (this.pollingThread != null) {
+				this.pollingThread.interrupt();
+			}
 		}
 		if (cleanExistingEvents) {
 			this.eventCallbacks.clear();
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java
index b8f046315..5e4235841 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java
@@ -28,6 +28,7 @@ public class AbstractOpenViduTestappE2eTest extends OpenViduTestE2e {
 
 	private void connectToOpenViduTestApp(OpenViduTestappUser user) {
 		user.getDriver().get(APP_URL);
+		user.getWaiter().until(ExpectedConditions.presenceOfElementLocated(By.id("livekit-url")));
 		WebElement urlInput = user.getDriver().findElement(By.id("livekit-url"));
 		urlInput.clear();
 		urlInput.sendKeys(LIVEKIT_URL);