Skip to content

2080: thread context was already set fix #2550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 30 commits into
base: 5.4.0-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9dbe896
2080: Thread context was already set
VitaliyBoyko May 24, 2025
f0ba6c3
2080: removed ok and cancels
VitaliyBoyko May 24, 2025
be386bd
2080: Add custom dialogs to generate new Magento 2 classes
VitaliyBoyko May 24, 2025
1cdaafc
2080: adds a new action to generate a Magento 2 EAV customer attribut…
VitaliyBoyko May 24, 2025
5cafb40
2080: Implemented new action for generating EAV Product attribute wit…
VitaliyBoyko May 24, 2025
5921c02
2080: bumped up version
VitaliyBoyko May 24, 2025
728a40a
Code style fixes
VitaliyBoyko May 26, 2025
01a3f3c
2880: Refactor code formatting for improved readability
VitaliyBoyko May 26, 2025
b86cf57
2880: Remove unused Swing imports and simplify dialog classes
VitaliyBoyko May 26, 2025
9649908
2880: static fixes
VitaliyBoyko May 26, 2025
4deb987
2880: static fixes 2
VitaliyBoyko May 26, 2025
e9fe89c
2880: static fixes 3
VitaliyBoyko May 26, 2025
5424030
2880: static fixes 4
VitaliyBoyko May 26, 2025
588a321
2880: static fixes 5
VitaliyBoyko May 26, 2025
03f9003
2880: static fixes 6
VitaliyBoyko May 26, 2025
771260f
2880: static fixes 7
VitaliyBoyko May 26, 2025
2ee1355
2080: bumped up version of phpstorm
VitaliyBoyko Jun 1, 2025
f3b22e7
2080: updated SharedSteps.kt asn gradle plugin version
VitaliyBoyko Jun 1, 2025
117e67f
2080: removed license activation
VitaliyBoyko Jun 1, 2025
03df6c8
2080: fixed UI tests
VitaliyBoyko Jun 8, 2025
90b2f5e
2080: debug
VitaliyBoyko Jun 8, 2025
0ec28cb
2080: debug 2
VitaliyBoyko Jun 8, 2025
6d7fa79
Removed UI tests, since there is no way to get license for CI
VitaliyBoyko Aug 2, 2025
7170c3f
Fixed tests
VitaliyBoyko Aug 2, 2025
aa7f733
Updated gradle.properties
VitaliyBoyko Aug 2, 2025
a4dfdd4
Adjusted new entity dialog
VitaliyBoyko Aug 2, 2025
632a103
Adjusted new entity dialog
VitaliyBoyko Aug 2, 2025
76b1931
Static fixes
VitaliyBoyko Aug 2, 2025
dfcb199
Static fixes 2
VitaliyBoyko Aug 2, 2025
9e2dd92
Removed mocker
VitaliyBoyko Aug 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
2080: fixed UI tests
  • Loading branch information
VitaliyBoyko committed Jun 8, 2025
commit 03df6c80c6c4b732c227d21ead38f3883182386a
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -32,4 +32,4 @@ class CreateAPluginDialogFixture(

val pluginName
get() = find<JTextFieldFixture>(byXpath("FilteredComboBox", "//div[@tooltiptext='Plugin name in di.xml']"))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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']")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down Expand Up @@ -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() }
Expand Down Expand Up @@ -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()
}
}
}
}
Loading