2080: fixed UI tests

Author: VitaliyBoyko

src/test/kotlin/com/magento/idea/magento2plugin/pages/CreateANewModuleDialogFixture.kt

@@ -19,7 +19,7 @@ fun RemoteRobot.createAModuleDialog(function: CreateAModuleDialogFixture.() -> U
 }
 
 @FixtureName("CreateAModuleDialog")
-@DefaultXpath("CreateAModuleDialog type", "//div[@class='NewModuleDialog']")
+@DefaultXpath("CreateAModuleDialog type", "//div[@class='MyDialog']")
 class CreateAModuleDialogFixture(
         remoteRobot: RemoteRobot,
         remoteComponent: RemoteComponent) : CommonContainerFixture(remoteRobot, remoteComponent) {

src/test/kotlin/com/magento/idea/magento2plugin/pages/CreateAPluginDialogFixture.kt

@@ -19,7 +19,7 @@ fun RemoteRobot.createAPluginDialog(function: CreateAPluginDialogFixture.() -> U
 }
 
 @FixtureName("CreateAPluginDialog")
-@DefaultXpath("CreateAPluginDialog type", "//div[@class='CreateAPluginDialog']")
+@DefaultXpath("CreateAPluginDialog type", "//div[@class='MyDialog']")
 class CreateAPluginDialogFixture(
         remoteRobot: RemoteRobot,
         remoteComponent: RemoteComponent) : CommonContainerFixture(remoteRobot, remoteComponent) {
@@ -32,4 +32,4 @@ class CreateAPluginDialogFixture(
 
     val pluginName
         get() = find<JTextFieldFixture>(byXpath("FilteredComboBox", "//div[@tooltiptext='Plugin name in di.xml']"))
-}
+}

src/test/kotlin/com/magento/idea/magento2plugin/pages/DialogFixture.kt

@@ -37,6 +37,6 @@ class DialogFixture(
         fun byTitle(title: String) = byXpath("title $title", "//div[@title='$title' and @class='MyDialog']")
 
         @JvmStatic
-        fun getJDialog(title: String) = byXpath("title $title", "//div[@title='$title' and @class='JDialog']")
+        fun getJDialog(title: String) = byXpath("title $title", "//div[@title='$title']")
     }
-}
+}

src/test/kotlin/com/magento/idea/magento2plugin/pages/IdeaFrame.kt

@@ -29,12 +29,12 @@ class IdeaFrame(remoteRobot: RemoteRobot, remoteComponent: RemoteComponent) :
 
     val projectViewTree
         get() = try {
-            find<ContainerFixture>(byXpath("//div[@class='ProjectViewTree']"))
+            find<ContainerFixture>(byXpath("//div[@class='MyProjectViewTree']"))
         } catch (e: Exception) {
             keyboard {
                 hotKey(VK_ALT, VK_1)
             }
-            find<ContainerFixture>(byXpath("//div[@class='ProjectViewTree']"))
+            find<ContainerFixture>(byXpath("//div[@class='MyProjectViewTree']"))
         }
 
     fun isProjectViewVisible(): Boolean {

src/test/kotlin/com/magento/idea/magento2plugin/steps/SharedSteps.kt

@@ -17,7 +17,6 @@ import com.magento.idea.magento2plugin.pages.*
 import java.awt.Point
 import java.awt.event.KeyEvent.*
 import java.io.File
-import java.io.IOException
 import java.nio.file.Paths
 import java.time.Duration.ofMinutes
 import java.util.*
@@ -99,17 +98,19 @@ class SharedSteps(private val remoteRobot: RemoteRobot) {
     }
 
     private fun enableMagentoSupport() {
+        Thread.sleep(7_000)
+
         try {
             //closing AI adv popup
             val dialog = remoteRobot.find(
-                DialogFixture::class.java, byXpath("//div[@class='MyDialog']")
+                DialogFixture::class.java, byXpath("//div[@name='dialog2']")
             )
-            dialog.button("Close").click()
+            dialog.click()
+            dialog.keyboard { key(VK_ESCAPE) }
         } catch (e: Exception) {
             //do nothing
         }
 
-
         remoteRobot.idea {
             step("Enable Magento Integration") {
                 waitFor(ofMinutes(1)) { isDumbMode().not() }
@@ -148,27 +149,4 @@ class SharedSteps(private val remoteRobot: RemoteRobot) {
             trustProjectLink.click()
         }
     }
-
-    /**
-     * Closes the browser by terminating its process based on the operating system.
-     */
-    fun closeBrowser() {
-        val os = System.getProperty("os.name").lowercase(Locale.getDefault())
-
-        try {
-            if (os.contains("win")) {
-                // For Windows: Close common browsers like Chrome, Firefox, etc.
-                Runtime.getRuntime().exec("taskkill /F /IM edge.exe")
-            } else if (os.contains("mac")) {
-                // For macOS: Kill browsers using `pkill`
-                Runtime.getRuntime().exec("killall -9 safari")
-            } else if (os.contains("nix") || os.contains("nux")) {
-                // For Linux-based systems: Kill typical browser processes
-                Runtime.getRuntime().exec("killall -9 firefox")
-                Runtime.getRuntime().exec("killall -9 chrome")
-            }
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-    }
-}
+}