Merge pull request #2376 from vitaliyboykocontributor/fixing-tests

Fixing tests
magento · Oct 20, 2024 · 4807653 · 4807653
2 parents 1ff7368 + e2c6826
commit 4807653
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 5.4.0
 
+## 5.3.1
+
+### Fixed
+
+- Custom theme couldn't be detected [#2348](https://github.com/magento/magento2-phpstorm-plugin/pull/2348)
+
 ## 5.3.0
 
 ### Added

diff --git a/build.gradle b/build.gradle
@@ -2,22 +2,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
-    id 'org.jetbrains.intellij' version '1.17.3'
+    id "org.jetbrains.intellij.platform" version "2.1.0"
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '2.2.0'
 }
 
 repositories {
     mavenCentral()
+
+    intellijPlatform {
+        defaultRepositories()
+        marketplace()
+    }
 }
 
 group 'com.magento.idea'
 version '5.4.0'
 
-apply plugin: 'org.jetbrains.intellij'
+apply plugin: 'org.jetbrains.intellij.platform'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'groovy'
@@ -32,28 +38,16 @@ java {
     targetCompatibility = javaVersion
 }
 
-intellij {
+intellijPlatform {
     version = ideaVersion
-    type = 'IU'
-    pluginName = 'com.magento.idea.magento2plugin'
-    plugins = [
-            "com.jetbrains.php:$phpPluginVersion",
-            'yaml',
-            'java-i18n',
-            'properties',
-            'com.intellij.css',
-            'JavaScript',
-            'com.intellij.lang.jsgraphql:242.20224.155',
-            'platform-images',
-            'copyright'
-    ]
-    updateSinceUntilBuild = false
-    sameSinceUntilBuild = false
-    downloadSources = !Boolean.valueOf(System.getenv('CI'))
-    sandboxDir = "${project.rootDir}/.idea-sandbox"
-
-    patchPluginXml {
-        changeNotes = provider { changelog.getLatest().toHTML() }
+    projectName = 'com.magento.idea.magento2plugin'
+
+    pluginConfiguration {
+        id = 'com.magento.idea.magento2plugin'
+        name = 'Magento PhpStorm'
+        version = '5.4.0'
+        description = 'This is a PhpStorm IDE plugin for a better Magento 2 development workflow.'
+        changeNotes = provider { changelog.getLatest().toHTML() } as Provider<? extends String>
     }
 }
 
@@ -114,6 +108,17 @@ dependencies {
     testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.9.0')
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.00")
+
+    intellijPlatform {
+        intellijIdeaUltimate '2024.2.3'
+        plugin("com.jetbrains.php", phpPluginVersion)
+        plugin("com.intellij.lang.jsgraphql", "242.20224.155")
+        bundledPlugin "JavaScript"
+        instrumentationTools()
+        bundledPlugin 'com.intellij.java'
+
+        testFramework TestFrameworkType.Platform.INSTANCE
+    }
 }
 
 test {

diff --git a/src/com/magento/idea/magento2plugin/util/RegExUtil.java b/src/com/magento/idea/magento2plugin/util/RegExUtil.java
@@ -64,7 +64,7 @@ public static class Magento {
                 = "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
 
         public static final String THEME_NAME
-                = "[a-z]+/[A-Z][a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";
+                = "[a-z]+/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+";
 
         public static final String MFTF_CURLY_BRACES
                 = ".*\\{\\{[^\\}]+\\}\\}.*";