From 5b394dc5effbb8f184c3f877058a01a2882d0ff2 Mon Sep 17 00:00:00 2001
From: "vladislav.shishov" <vladislav.shishov@jetbrains.com>
Date: Fri, 4 Oct 2024 00:13:29 +0300
Subject: [PATCH] [remote-driver] fix JCefUI

GitOrigin-RevId: 78f642297735a0625bee4341698d0340524b6247
---
 .../src/com/intellij/driver/sdk/ui/components/JCefUI.kt       | 2 +-
 .../remotedriver/jcef/JcefComponentWrapper.kt                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/JCefUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/JCefUI.kt
index c34d9d7af71a..2210f40aeeff 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/JCefUI.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/JCefUI.kt
@@ -44,6 +44,7 @@ fun Finder.jcef(@Language("xpath") xpath: String? = null, action: JCefUI.() -> U
 class JCefUI(data: ComponentData) : UiComponent(data) {
   private val jcefWorker by lazy {
     driver.new(JcefComponentWrapper::class, component).apply {
+      waitFor("Document exists") { hasDocument() }
       runJs(initScript)
     }
   }
@@ -94,7 +95,6 @@ class JCefUI(data: ComponentData) : UiComponent(data) {
   fun getUrl(): String =  jcefWorker.getUrl()
 
   fun getHtml(): String {
-    waitFor("Document exists") { hasDocument() }
     return callJs("""document.documentElement.outerHTML""")
   }
 
diff --git a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/jcef/JcefComponentWrapper.kt b/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/jcef/JcefComponentWrapper.kt
index c2e86b2d8658..2f8e092b5b1b 100644
--- a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/jcef/JcefComponentWrapper.kt
+++ b/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/jcef/JcefComponentWrapper.kt
@@ -49,10 +49,10 @@ internal class JcefComponentWrapper(private val component: Component) {
       jbCefBrowser = currentComponent.getClientProperty(JB_BROWSER_KEY)
       currentComponent = currentComponent.parent as JComponent
     }
-    require(jbCefBrowser != null) {
+    check(jbCefBrowser != null) {
       "Failed to retrieve jbCefBrowser from $component"
     }
-    require(jbCefBrowser is JBCefBrowserBase) {
+    check(jbCefBrowser is JBCefBrowserBase) {
       "$jbCefBrowser is not JBCefBrowser"
     }
     return jbCefBrowser