Merge pull request #147 from yaroslavafenkin/JENKINS-74871

[JENKINS-74871] Fix the broken jelly view

Author: res0nance

src/main/resources/hudson/plugins/validating_string_parameter/ValidatingStringParameterDefinition/index.jelly

@@ -32,8 +32,11 @@ THE SOFTWARE.
 	<f:invisibleEntry>
 		<f:textbox field="failedValidationMessage" value="${it.failedValidationMessage}"/>
 	</f:invisibleEntry>
-	<f:entry title="${h.xmlEscape(it.name)}" description="${it.formattedDescription}" field="defaultValue">
-		<f:textbox value="${it.defaultValue}" checkUrl="${it.descriptor.descriptorFullUrl}/validate"
-				   checkDependsOn="regex failedValidationMessage"/>
+	<f:entry title="${h.xmlEscape(it.name)}" description="${it.formattedDescription}">
+		<div name="parameter" description="${it.formattedDescription}">
+			<input type="hidden" name="name" value="${it.name}"/>
+			<f:textbox name="value" value="${it.defaultValue}" checkUrl="${it.descriptor.descriptorFullUrl}/validate"
+					   checkDependsOn="../regex ../failedValidationMessage"/>
+		</div>
 	</f:entry>
 </j:jelly>

src/test/java/hudson/plugins/validating_string_parameter/ValidatingStringParameterTest.java

@@ -1,14 +1,30 @@
 package hudson.plugins.validating_string_parameter;
 
+import hudson.Functions;
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.ParameterValue;
+import hudson.model.ParametersAction;
 import hudson.model.ParametersDefinitionProperty;
+import hudson.tasks.BatchFile;
+import hudson.tasks.Shell;
+import org.htmlunit.html.DomNode;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlPage;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 
+import java.util.List;
+
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -29,4 +45,30 @@ public void pipeline() throws Exception {
         r.buildAndAssertSuccess(p);
         assertThat(p.getProperty(ParametersDefinitionProperty.class), is(notNullValue()));
     }
+
+    @Test
+    public void freestyle() throws Exception {
+        FreeStyleProject p = r.createProject(FreeStyleProject.class, "fs");
+        p.getBuildersList().add(Functions.isWindows() ? new BatchFile("echo test") : new Shell("echo test"));
+
+        ValidatingStringParameterDefinition def = new ValidatingStringParameterDefinition("name", "defVal", "\\w+", "Value must match the following pattern: \\w+");
+        p.addProperty(new ParametersDefinitionProperty(def));
+
+        try (JenkinsRule.WebClient wc = r.createWebClient()) {
+            wc.setThrowExceptionOnFailingStatusCode(false);
+            HtmlPage htmlPage = wc.goTo("job/fs/build");
+            HtmlButton buildButton = htmlPage.querySelector(".jenkins-button--primary");
+            buildButton.click();
+        }
+
+        r.waitUntilNoActivity();
+        List<ParameterValue> parameters = p.getLastSuccessfulBuild().getAction(ParametersAction.class).getParameters();
+        assertThat(parameters, is(not(empty())));
+        ParameterValue parameterValue = parameters.get(0);
+        assertThat(parameterValue, is(instanceOf(ValidatingStringParameterValue.class)));
+        ValidatingStringParameterValue val = (ValidatingStringParameterValue) parameterValue;
+        assertThat(val.getRegex(), is(equalTo("\\w+")));
+        assertThat(val.getValue(), is(equalTo("defVal")));
+        assertThat(val.getName(), is(equalTo("name")));
+    }
 }