From 69005ec57a7b9b636d252233a99f7bf17fcc2e29 Mon Sep 17 00:00:00 2001 From: "Maxim.Kolmakov" Date: Thu, 11 Jul 2024 16:37:12 +0200 Subject: [PATCH] Reapply "[driver][ui-tests] support toolbarHeader locator on linux" This reverts commit d25efbcbcbde3d1e2e9d889acf78e94cf4e10c6d. GitOrigin-RevId: 8a449cd0d0ea9842374c430c4df5c9c84411fe1f --- .../intellij/driver/sdk/ui/components/FrameHeaderUI.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt index 4fa376e09b49..4d28fe9358ea 100644 --- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt +++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt @@ -1,9 +1,13 @@ package com.intellij.driver.sdk.ui.components import com.intellij.driver.sdk.ui.Finder +import com.intellij.driver.sdk.ui.xQuery +import com.intellij.openapi.util.SystemInfo.isLinux -val Finder.toolbarHeader: FrameHeaderUI get() = - x("//div[@class='MacToolbarFrameHeader' or @class='ToolbarFrameHeader']", FrameHeaderUI::class.java) +val Finder.toolbarHeader: FrameHeaderUI + get() = x(xQuery { + or(byClass("MacToolbarFrameHeader"), if (isLinux) byClass("MainToolbar") else byClass("ToolbarFrameHeader")) + }, FrameHeaderUI::class.java) class FrameHeaderUI(data: ComponentData) : UiComponent(data) { val separateRowMenu: UiComponent get() = x("//div[@class='IdeJMenuBar']")