From 9f03c79291916aae3436b1dc35b4c33e95ff8d37 Mon Sep 17 00:00:00 2001
From: ivanovEV <ivanovev@melonfashion.com>
Date: Mon, 26 Feb 2024 14:17:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...{InitExtentionMethod.groovy => InitExtensionMethod.groovy} | 2 +-
 .../jenkins/library/configuration/InitInfoBaseOptions.groovy  | 2 +-
 .../library/steps/EdtToDesignerFormatTransformation.groovy    | 4 ++--
 src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy      | 4 ++--
 test/integration/groovy/jobConfigurationTest.groovy           | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename src/ru/pulsar/jenkins/library/configuration/{InitExtentionMethod.groovy => InitExtensionMethod.groovy} (87%)

diff --git a/src/ru/pulsar/jenkins/library/configuration/InitExtentionMethod.groovy b/src/ru/pulsar/jenkins/library/configuration/InitExtensionMethod.groovy
similarity index 87%
rename from src/ru/pulsar/jenkins/library/configuration/InitExtentionMethod.groovy
rename to src/ru/pulsar/jenkins/library/configuration/InitExtensionMethod.groovy
index 4b31eb5b..cafc8c61 100644
--- a/src/ru/pulsar/jenkins/library/configuration/InitExtentionMethod.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/InitExtensionMethod.groovy
@@ -2,7 +2,7 @@ package ru.pulsar.jenkins.library.configuration
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-enum InitExtentionMethod {
+enum InitExtensionMethod {
     @JsonProperty("fromSource")
     SOURCE,
 
diff --git a/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy
index 88f51b4c..860923ae 100644
--- a/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy
@@ -39,7 +39,7 @@ class InitInfoBaseOptions implements Serializable {
             * fromSource - инициализация расширения из исходников;
             * fromInternet - скачивание скомпилированного cfe по ссылке.
         """)
-        InitExtentionMethod initMethod = InitExtentionMethod.SOURCE;
+        InitExtensionMethod initMethod = InitExtensionMethod.SOURCE;
 
         @JsonPropertyDescription("""
         Хранит в себе путь к расширению.
diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
index d94e2456..ca3c6a42 100644
--- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
@@ -4,7 +4,7 @@ package ru.pulsar.jenkins.library.steps
 import ru.pulsar.jenkins.library.IStepExecutor
 import ru.pulsar.jenkins.library.configuration.JobConfiguration
 import ru.pulsar.jenkins.library.configuration.SourceFormat
-import ru.pulsar.jenkins.library.configuration.InitExtentionMethod
+import ru.pulsar.jenkins.library.configuration.InitExtensionMethod
 import ru.pulsar.jenkins.library.ioc.ContextRegistry
 import ru.pulsar.jenkins.library.utils.Constants
 import ru.pulsar.jenkins.library.utils.EDT
@@ -78,7 +78,7 @@ class EdtToDesignerFormatTransformation implements Serializable {
 
         config.initInfoBaseOptions.extensions.each {
 
-            if (it.initMethod != InitExtentionMethod.SOURCE) {
+            if (it.initMethod != InitExtensionMethod.SOURCE) {
                 return
             }
 
diff --git a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
index 8e19a8c9..772b2a41 100644
--- a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
@@ -3,7 +3,7 @@ package ru.pulsar.jenkins.library.steps
 import ru.pulsar.jenkins.library.IStepExecutor
 import ru.pulsar.jenkins.library.configuration.JobConfiguration
 import ru.pulsar.jenkins.library.configuration.SourceFormat
-import ru.pulsar.jenkins.library.configuration.InitExtentionMethod
+import ru.pulsar.jenkins.library.configuration.InitExtensionMethod
 import ru.pulsar.jenkins.library.configuration.InitInfoBaseOptions.Extension
 import ru.pulsar.jenkins.library.ioc.ContextRegistry
 import ru.pulsar.jenkins.library.utils.Logger
@@ -44,7 +44,7 @@ class GetExtensions implements Serializable {
         extractConvertedExtensions(sourceDirName, steps)
 
         config.initInfoBaseOptions.extensions.each {
-            if (it.initMethod == InitExtentionMethod.SOURCE) {
+            if (it.initMethod == InitExtensionMethod.SOURCE) {
                 Logger.println("Сборка расширения ${it.name} из исходников")
                 String srcDir = getSrcDir(it, sourceDirName)
                 buildExtension(it, srcDir, vrunnerPath, steps)
diff --git a/test/integration/groovy/jobConfigurationTest.groovy b/test/integration/groovy/jobConfigurationTest.groovy
index f88ce732..e3ded0b8 100644
--- a/test/integration/groovy/jobConfigurationTest.groovy
+++ b/test/integration/groovy/jobConfigurationTest.groovy
@@ -74,6 +74,5 @@ class jobConfigurationTest {
         rule.assertLogContains("v8version='8.3.12.1500'", run)
         rule.assertLogContains("sonarScannerToolName='sonar-scanner'", run)
         rule.assertLogContains("initMethod=FROM_SOURCE", run)
-        rule.assertLogContains("path=\"/src/cfe/тест\"", run)
     }
 }
\ No newline at end of file