diff --git a/ui-test-example/build.gradle b/ui-test-example/build.gradle index e7a1d97d..0e34781d 100644 --- a/ui-test-example/build.gradle +++ b/ui-test-example/build.gradle @@ -61,9 +61,6 @@ runIdeForUiTests { systemProperty "apple.laf.useScreenMenuBar", "false" systemProperty "idea.trust.all.projects", "true" systemProperty "ide.show.tips.on.startup.default.value", "false" -// systemProperty "ide.experimental.ui", "true" - systemProperty "linux.native.menu.force.disable", "true" - systemProperty "linux.native.menu", "false" // systemProperty "eap.require.license", "true" } diff --git a/ui-test-example/src/test/java/org/intellij/examples/simple/plugin/CreateCommandLineJavaTest.java b/ui-test-example/src/test/java/org/intellij/examples/simple/plugin/CreateCommandLineJavaTest.java index 74bd8d37..ffff50f2 100644 --- a/ui-test-example/src/test/java/org/intellij/examples/simple/plugin/CreateCommandLineJavaTest.java +++ b/ui-test-example/src/test/java/org/intellij/examples/simple/plugin/CreateCommandLineJavaTest.java @@ -69,10 +69,6 @@ void createCommandLineProject(final RemoteRobot remoteRobot) { sharedSteps.closeTipOfTheDay(); final IdeaFrame idea = remoteRobot.find(IdeaFrame.class, ofSeconds(10)); - idea.runJs(""" - const menuBar = component.getJMenuBar() - menuBar.setVisible(true) - """); waitFor(ofMinutes(5), () -> !idea.isDumbMode()); step("Create Java file", () -> { diff --git a/ui-test-example/src/test/kotlin/org/intellij/examples/simple/plugin/pages/IdeaFrame.kt b/ui-test-example/src/test/kotlin/org/intellij/examples/simple/plugin/pages/IdeaFrame.kt index 496ea98a..e139a852 100644 --- a/ui-test-example/src/test/kotlin/org/intellij/examples/simple/plugin/pages/IdeaFrame.kt +++ b/ui-test-example/src/test/kotlin/org/intellij/examples/simple/plugin/pages/IdeaFrame.kt @@ -6,22 +6,13 @@ import com.intellij.remoterobot.RemoteRobot import com.intellij.remoterobot.data.RemoteComponent import com.intellij.remoterobot.fixtures.* import com.intellij.remoterobot.search.locators.byXpath -import com.intellij.remoterobot.steps.CommonSteps import com.intellij.remoterobot.stepsProcessing.step +import com.intellij.remoterobot.utils.component import com.intellij.remoterobot.utils.waitFor import java.time.Duration fun RemoteRobot.idea(function: IdeaFrame.() -> Unit) { - find(timeout = Duration.ofSeconds(10)) - .apply { - step("Enable menu") { - runJs(""" - const menuBar = component.getJMenuBar() - menuBar.setVisible(true) - """) - } - } - .apply(function) + find(timeout = Duration.ofSeconds(10)).apply(function) } @FixtureName("Idea frame") @@ -37,9 +28,6 @@ class IdeaFrame(remoteRobot: RemoteRobot, remoteComponent: RemoteComponent) : val menuBar: JMenuBarFixture get() = step("Menu...") { - if (remoteRobot.findAll(JMenuBarFixture::class.java, JMenuBarFixture.byType()).isEmpty()) { - CommonSteps(remoteRobot).invokeAction("MainMenuButton.ShowMenu") - } return@step remoteRobot.find(JMenuBarFixture::class.java, JMenuBarFixture.byType()) }