Merge pull request #243 from jglick/slashy-branches-JENKINS-30744

[JENKINS-30744] Updated to use Branch.encodedName
jenkinsci · Nov 6, 2015 · a8ff4ec · a8ff4ec
2 parents b5082ba + a0b21ac
commit a8ff4ec
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 2 deletions.
diff --git a/multibranch/pom.xml b/multibranch/pom.xml
@@ -58,7 +58,7 @@ THE SOFTWARE.
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>branch-api</artifactId>
-            <version>0.2-beta-6</version>
+            <version>0.2-beta-7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -108,6 +108,12 @@ THE SOFTWARE.
             <artifactId>mercurial</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.modules</groupId>
+            <artifactId>sshd</artifactId>
+            <version>1.6</version>
+            <scope>test</scope><!-- from git-server via workflow-cps-global-lib and otherwise unavailable during tests -->
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/...rc/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java b/...rc/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java
@@ -44,7 +44,7 @@ public class WorkflowBranchProjectFactory extends BranchProjectFactory<WorkflowJ
     @DataBoundConstructor public WorkflowBranchProjectFactory() {}
 
     @Override public WorkflowJob newInstance(Branch branch) {
-        WorkflowJob job = new WorkflowJob((WorkflowMultiBranchProject) getOwner(), branch.getName());
+        WorkflowJob job = new WorkflowJob((WorkflowMultiBranchProject) getOwner(), branch.getEncodedName());
         job.setDefinition(new SCMBinder());
         setBranch(job, branch);
         return job;

diff --git a/...est/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactoryTest.java b/...est/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactoryTest.java
@@ -0,0 +1,100 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.workflow.multibranch;
+
+import java.io.File;
+import jenkins.branch.BranchProperty;
+import jenkins.branch.BranchSource;
+import jenkins.branch.DefaultBranchPropertyStrategy;
+import jenkins.plugins.git.GitSCMSource;
+import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import static org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectTest.scheduleAndFindBranchProject;
+import org.jenkinsci.plugins.workflow.steps.scm.GitSampleRepoRule;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runners.model.Statement;
+import org.jvnet.hudson.test.BuildWatcher;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.RestartableJenkinsRule;
+
+public class WorkflowBranchProjectFactoryTest {
+
+    @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
+    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
+    @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
+
+    @Issue("JENKINS-30744")
+    @Test public void slashyBranches() {
+        story.addStep(new Statement() {
+            @Override public void evaluate() throws Throwable {
+                sampleRepo.init();
+                sampleRepo.git("checkout", "-b", "dev/main");
+                ScriptApproval.get().approveSignature("method java.lang.String replaceFirst java.lang.String java.lang.String"); // TODO add to generic-whitelist
+                sampleRepo.write("Jenkinsfile",
+                    "echo \"branch=${env.BRANCH_NAME}\"\n" +
+                    "node {\n" +
+                    "  checkout scm\n" +
+                    "  echo \"workspace=${pwd().replaceFirst('.+dev', 'dev')}\"\n" +
+                    "}");
+                sampleRepo.git("add", "Jenkinsfile");
+                sampleRepo.git("commit", "--all", "--message=flow");
+                WorkflowMultiBranchProject mp = story.j.jenkins.createProject(WorkflowMultiBranchProject.class, "p");
+                mp.getSourcesList().add(new BranchSource(new GitSCMSource(null, sampleRepo.toString(), "", "*", "", false), new DefaultBranchPropertyStrategy(new BranchProperty[0])));
+                WorkflowJob p = scheduleAndFindBranchProject(mp, "dev%2Fmain");
+                assertEquals(1, mp.getItems().size());
+                story.j.waitUntilNoActivity();
+                WorkflowRun b1 = p.getLastBuild();
+                assertEquals(1, b1.getNumber());
+                story.j.assertLogContains("branch=dev/main", b1);
+                story.j.assertLogContains("workspace=dev%2Fmain", b1);
+                verifyProject(p);
+            }
+        });
+        story.addStep(new Statement() {
+            @Override public void evaluate() throws Throwable {
+                WorkflowJob p = story.j.jenkins.getItemByFullName("p/dev%2Fmain", WorkflowJob.class);
+                assertNotNull(p);
+                WorkflowRun b2 = p.scheduleBuild2(0).get();
+                assertEquals(2, b2.getNumber());
+                story.j.assertLogContains("branch=dev/main", b2);
+                story.j.assertLogContains("workspace=dev%2Fmain", b2);
+                verifyProject(p);
+            }
+        });
+    }
+    private void verifyProject(WorkflowJob p) throws Exception {
+        assertEquals("dev%2Fmain", p.getName());
+        assertEquals("dev/main", p.getDisplayName());
+        assertEquals("p/dev%2Fmain", p.getFullName());
+        assertEquals("p » dev/main", p.getFullDisplayName());
+        story.j.createWebClient().getPage(p);
+        assertEquals(new File(new File(p.getParent().getRootDir(), "branches"), "dev%2Fmain"), p.getRootDir());
+    }
+
+}