JENKINS-24735 - Add support for build parameters in Subversion URLs

* Expand parameters from upstream job not from property owner * Updated test
jenkinsci · Oct 20, 2014 · 5da95aa · 5da95aa
1 parent 453bb3b
commit 5da95aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java b/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
@@ -124,8 +124,8 @@ public ModuleLocation getUpstreamSubversionLocation() {
 
 				}
 			}
-			// expand project variables
-			ml = ml.getExpandedLocation(this.getOwner());
+			// expand upstream project variables
+			ml = ml.getExpandedLocation(p);
 			return ml;
         }
         return null;

diff --git a/src/test/java/jenkins/plugins/svnmerge/FeatureBranchPropertyTest.java b/src/test/java/jenkins/plugins/svnmerge/FeatureBranchPropertyTest.java
@@ -57,9 +57,9 @@ public void testUpStreamURLwithParams()
 		ParameterDefinition def2 = new StringParameterDefinition("PROJECT", "b");
 		p.addProperty(new ParametersDefinitionProperty(def1,def2));
 		FeatureBranchProperty jobProp = new FeatureBranchProperty(p.getName());
-		p.addProperty(jobProp);
+		FreeStyleProject p2 = createFreeStyleProject();
+		p2.addProperty(jobProp);
 		assertEquals( "https://root/a/b/trunk",jobProp.getUpstreamURL().toDecodedString());
-
 	}