Skip to content

Commit 1368767

Browse files
committed
fix: Fixed MenuBar XPath for windows for IJ 2024.1
Signed-off-by: Richard Kocian <[email protected]> rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
1 parent 3e037c9 commit 1368767

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/menubar/MenuBar.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ private JButtonFixture mainMenuItem(String label) {
7575
CommonContainerFixture cf;
7676
if (remoteRobot.isLinux()) {
7777
cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.LINUX_MAIN_MENU), Duration.ofSeconds(10));
78+
} else if (remoteRobot.isWin() && ideaVersion.toInt() >= 20241) {
79+
cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.WINDOWS_MAIN_MENU_2024_1_AND_NEWER), Duration.ofSeconds(10));
7880
} else if (remoteRobot.isWin() && ideaVersion.toInt() >= 20222) {
79-
cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.WINDOWS_MAIN_MENU_2022_2_AND_NEWER), Duration.ofSeconds(10));
81+
cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.WINDOWS_MAIN_MENU_2022_2_TO_2023_2), Duration.ofSeconds(10));
8082
} else if (remoteRobot.isWin() && ideaVersion.toInt() >= 20203) {
8183
cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.WINDOWS_MAIN_MENU_2020_3_TO_2022_1), Duration.ofSeconds(10));
8284
} else {

src/main/java/com/redhat/devtools/intellij/commonuitest/utils/constants/XPathDefinitions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public class XPathDefinitions {
2525
public static final String MAVEN_TOOL_WINDOW = "//div[@accessiblename='Maven Tool Window']";
2626
public static final String GRADLE_TOOL_WINDOW = "//div[@accessiblename='Gradle Tool Window']";
2727
public static final String LINUX_MAIN_MENU = "//div[@class='LinuxIdeMenuBar']";
28-
public static final String WINDOWS_MAIN_MENU_2022_2_AND_NEWER = "//div[@class='IdeMenuBar']";
28+
public static final String WINDOWS_MAIN_MENU_2024_1_AND_NEWER = "//div[@class='IdeJMenuBar']";
29+
public static final String WINDOWS_MAIN_MENU_2022_2_TO_2023_2 = "//div[@class='IdeMenuBar']";
2930
public static final String WINDOWS_MAIN_MENU_2020_3_TO_2022_1 = "//div[@class='MenuFrameHeader']";
3031
public static final String WINDOWS_MAIN_MENU_2020_2_AND_OLDER = "//div[@class='CustomHeaderMenuBar']";
3132
public static final String IDE_STATUS_BAR = "//div[@class='IdeStatusBarImpl']";

0 commit comments

Comments
 (0)