Skip to content

Commit 7f19fb8

Browse files
committed
1211: adjusted path and SettingsForm
1 parent 85746b6 commit 7f19fb8

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ out
3737
.idea-sandbox
3838
build
3939
.intellijPlatform/*
40-
video/*
40+
video/*
41+
intellij-test-project

src/main/java/com/magento/idea/magento2plugin/project/SettingsForm.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ protected void reindex() {
120120

121121
@Override
122122
public boolean isModified() {
123+
if (moduleDefaultLicenseName == null) {
124+
return true;
125+
}
126+
123127
final boolean licenseChanged = !moduleDefaultLicenseName.getText().equals(
124128
getSettings().defaultLicense
125129
);

src/test/kotlin/com/magento/idea/magento2plugin/actions/content/MarkDirectoryAsMagentoRootTest.kt

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,9 @@ class MarkDirectoryAsMagentoRootTest {
3939

4040
@BeforeEach
4141
fun setup() {
42-
// Get the user's home directory in a platform-independent way
43-
val userHomeDir = System.getProperty("user.home")
44-
4542
// Create a temporary directory inside the user's home directory
46-
val tempDirPath = Paths.get(userHomeDir, "intellij-test-project")
47-
tempProjectDir = createDirectories(tempDirPath).toFile().apply {
43+
val projectDir = Paths.get("intellij-test-project")
44+
tempProjectDir = createDirectories(projectDir).toFile().apply {
4845
// Ensure the temporary directory is deleted and recreated
4946
if (exists()) {
5047
deleteRecursively()
@@ -77,20 +74,20 @@ class MarkDirectoryAsMagentoRootTest {
7774
@Video
7875
fun testMarkDirectoryAsMagentoRoot(remoteRobot: RemoteRobot) = with(remoteRobot) {
7976
// temporary workaround until we get license for CI
80-
if (System.getenv("GITHUB_ACTIONS") == "true") {
81-
val startTrial = find<ContainerFixture>(byXpath("//div[@visible_text='Start trial']"))
82-
startTrial.click()
83-
val startTrialFree = find<ContainerFixture>(byXpath("//div[@class='s']"))
84-
startTrialFree.click()
85-
val dialog = find<DialogFixture>(byXpath("//div[@class='MyDialog']"))
86-
dialog.button("Close").click()
87-
Thread.sleep(10_000)
88-
closeBrowser()
89-
} else {
90-
val dialog = find<DialogFixture>(byXpath("//div[@class='MyDialog']"))
91-
dialog.button("Activate").click()
92-
dialog.button("Close").click()
93-
}
77+
// if (System.getenv("GITHUB_ACTIONS") == "true") {
78+
// val startTrial = find<ContainerFixture>(byXpath("//div[@visible_text='Start trial']"))
79+
// startTrial.click()
80+
// val startTrialFree = find<ContainerFixture>(byXpath("//div[@class='s']"))
81+
// startTrialFree.click()
82+
// val dialog = find<DialogFixture>(byXpath("//div[@class='MyDialog']"))
83+
// dialog.button("Close").click()
84+
// Thread.sleep(10_000)
85+
// closeBrowser()
86+
// } else {
87+
// val dialog = find<DialogFixture>(byXpath("//div[@class='MyDialog']"))
88+
// dialog.button("Activate").click()
89+
// dialog.button("Close").click()
90+
// }
9491
// end temporary workaround
9592

9693
welcomeFrame {

0 commit comments

Comments
 (0)