Merge pull request #8 from ydubreuil/jenkins-29615

[JENKINS-22849] Improve HTTP response to include item queue location
jenkinsci · Aug 11, 2015 · e7257ce · e7257ce
2 parents f1239a3 + ec1a216
commit e7257ce
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/build_token_root/BuildRootAction.java b/src/main/java/org/jenkinsci/plugins/build_token_root/BuildRootAction.java
@@ -32,6 +32,7 @@
 import hudson.model.ParameterValue;
 import hudson.model.ParametersAction;
 import hudson.model.ParametersDefinitionProperty;
+import hudson.model.Queue;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.ACL;
 import hudson.triggers.SCMTrigger;
@@ -55,6 +56,8 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+
 @Extension
 public class BuildRootAction implements UnprotectedRootAction {
 
@@ -83,8 +86,12 @@ public void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter Str
             LOGGER.fine("wrong kind");
             throw HttpResponses.error(HttpServletResponse.SC_BAD_REQUEST, "Use /buildByToken/buildWithParameters for this job since it takes parameters");
         }
-        Jenkins.getInstance().getQueue().schedule(p, delay.getTime(), getBuildCause(req));
-        ok(rsp);
+        Queue.Item item = Jenkins.getInstance().getQueue().schedule(p, delay.getTime(), getBuildCause(req));
+        if (item != null) {
+            rsp.sendRedirect(SC_CREATED, req.getContextPath() + '/' + item.getUrl());
+        } else {
+            rsp.sendRedirect(".");
+        }
     }
 
     public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @QueryParameter String job, @QueryParameter TimeDuration delay) throws IOException, ServletException {
@@ -105,8 +112,12 @@ public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @Quer
         		values.add(value);
         	}
         }
-        Jenkins.getInstance().getQueue().schedule(p, delay.getTime(), new ParametersAction(values), getBuildCause(req));
-        ok(rsp);
+        Queue.Item item = Jenkins.getInstance().getQueue().schedule(p, delay.getTime(), new ParametersAction(values), getBuildCause(req));
+        if (item != null) {
+            rsp.sendRedirect(SC_CREATED, req.getContextPath() + '/' + item.getUrl());
+        } else {
+            rsp.sendRedirect(".");
+        }
     }
 
     public void doPolling(StaplerRequest req, StaplerResponse rsp, @QueryParameter String job) throws IOException, ServletException {

diff --git a/src/test/java/org/jenkinsci/plugins/build_token_root/BuildRootActionTest.java b/src/test/java/org/jenkinsci/plugins/build_token_root/BuildRootActionTest.java
@@ -24,7 +24,9 @@
 
 package org.jenkinsci.plugins.build_token_root;
 
+import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.google.inject.matcher.Matchers;
 import hudson.model.Job;
 import hudson.model.Run;
 import java.net.HttpURLConnection;
@@ -33,6 +35,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.ParameterizedJobMixIn;
+import org.apache.commons.httpclient.HttpStatus;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import static org.junit.Assert.*;
@@ -76,12 +79,16 @@ private <JobT extends Job<JobT, RunT> & ParameterizedJobMixIn.ParameterizedJob,
         wc.assertFails(p.getUrl() + "build?token=secret", HttpURLConnection.HTTP_FORBIDDEN);
         j.waitUntilNoActivity();
         assertEquals(0, p.getBuilds().size());
-        wc.goTo("buildByToken/build?job=" + p.getFullName() + "&token=secret&delay=0sec");
+        Page page = wc.goTo("buildByToken/build?job=" + p.getFullName() + "&token=secret&delay=0sec", null);
         j.waitUntilNoActivity();
         assertEquals(1, p.getBuilds().size());
-        wc.goTo("buildByToken/build?job=" + p.getFullName() + "&token=secret&delay=0sec");
+        assertEquals(HttpStatus.SC_CREATED, page.getWebResponse().getStatusCode());
+        assertTrue(page.getWebResponse().getResponseHeaderValue("Location").contains("/queue/item/"));
+        page = wc.goTo("buildByToken/build?job=" + p.getFullName() + "&token=secret&delay=0sec", null);
         j.waitUntilNoActivity();
         assertEquals(2, p.getBuilds().size());
+        assertEquals(HttpStatus.SC_CREATED, page.getWebResponse().getStatusCode());
+        assertTrue(page.getWebResponse().getResponseHeaderValue("Location").contains("/queue/item/"));
         wc.assertFails("buildByToken/build?job=" + p.getFullName() + "&token=socket&delay=0sec", HttpURLConnection.HTTP_FORBIDDEN);
         j.waitUntilNoActivity();
         assertEquals(2, p.getBuilds().size());