Merge pull request #57 from blanked/support-views

Added support for views
jenkinsci · Sep 24, 2019 · b06f237 · b06f237
2 parents 0114296 + ca4956a
commit b06f237
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java b/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.ParameterizedRemoteTrigger;
 
+import static java.lang.Math.min;
 import static org.apache.commons.lang.StringUtils.isEmpty;
 import static org.apache.commons.lang.StringUtils.trimToEmpty;
 import static org.apache.commons.lang.StringUtils.trimToNull;
@@ -288,7 +289,7 @@ public List<String> getParameterList(BuildContext context) {
 	 * Reads a file from the jobs workspace, and loads the list of parameters from
 	 * with in it. It will also call ```getCleanedParameters``` before returning.
 	 *
-	 * @param build
+	 * @param BuildContext context
 	 * @return List<String> of build parameters
 	 */
 	private List<String> loadExternalParameterFile(BuildContext context) {
@@ -336,7 +337,7 @@ private void removeEmptyElements(Collection<String> collection) {
 	 * that no type of character encoding is happening at this step. All encoding
 	 * happens in the "buildUrlQueryString" method.
 	 *
-	 * @param List <String> parameters
+	 * @param List<String> parameters
 	 * @return List<String> of build parameters
 	 */
 	private List<String> getCleanedParameters(List<String> parameters) {
@@ -510,7 +511,12 @@ private String getRootUrlFromJobUrl(String jobUrl) throws MalformedURLException
 		if (isEmpty(jobUrl))
 			return null;
 		if (FormValidationUtils.isURL(jobUrl)) {
-			int index = jobUrl.indexOf("/job/");
+			int index;
+			if (jobUrl.contains("/view/")) {
+				index = min(jobUrl.indexOf("/view/"), jobUrl.indexOf("/job/"));
+			} else {
+				index = jobUrl.indexOf("/job/");
+			}
 			if (index < 0)
 				throw new MalformedURLException("Expected '/job/' element in job URL but was: " + jobUrl);
 			return jobUrl.substring(0, index);

diff --git a/...t/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java b/...t/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java
@@ -36,6 +36,7 @@
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.StringParameterDefinition;
 import hudson.model.User;
+import hudson.model.ListView;
 import hudson.security.HudsonPrivateSecurityRealm;
 import hudson.security.SecurityRealm;
 import hudson.security.AuthorizationStrategy.Unsecured;
@@ -520,4 +521,15 @@ public void testRemoteBuildWith5KByteString() throws Exception {
 		_testRemoteBuild(true, true, remoteProject, parms);
 	}
 
+	@Test
+	public void testRemoteViewBuild() throws Exception {
+		disableAuth();
+
+		FreeStyleProject remoteProject = jenkinsRule.createFreeStyleProject("test-job");
+		ListView view = new ListView("test-view", jenkinsRule.getInstance());
+		view.add(remoteProject);
+		jenkinsRule.getInstance().addView(view);
+		_testRemoteBuild(false, false, remoteProject);
+	}
+
 }