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