Merge pull request #100 from raul-arabaolaza/JENKINS-45501

[JENKINS-45501] cloudbees-folder is failing in the PCT against cores 2.32, 2.42 and 2.60
jenkinsci · Jul 14, 2017 · 176f0a8 · 176f0a8
2 parents bfa9089 + 1df5434
commit 176f0a8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,6 @@
   <url>https://wiki.jenkins-ci.org/display/JENKINS/CloudBees+Folders+Plugin</url>
   <properties>
     <jenkins.version>1.642.3</jenkins.version>
-    <jenkins-test-harness.version>2.18</jenkins-test-harness.version>
     <no-test-jar>false</no-test-jar>
   </properties>
   <licenses>
@@ -60,9 +59,8 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-auth</artifactId>
-      <version>1.3</version>
+      <version>1.6</version>
       <scope>test</scope>
-      <type>jar</type>
     </dependency>
   </dependencies>
 

diff --git a/src/test/java/com/cloudbees/hudson/plugins/folder/FolderTest.java b/src/test/java/com/cloudbees/hudson/plugins/folder/FolderTest.java
@@ -26,10 +26,9 @@
 
 import com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider;
 import com.cloudbees.plugins.credentials.domains.DomainCredentials;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput;
+import com.gargoylesoftware.htmlunit.HttpMethod;
+import com.gargoylesoftware.htmlunit.WebRequest;
+import com.gargoylesoftware.htmlunit.html.*;
 import hudson.model.Actionable;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
@@ -47,6 +46,8 @@
 import hudson.views.BuildButtonColumn;
 import hudson.views.JobColumn;
 import java.io.IOException;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -137,22 +138,26 @@ public class FolderTest {
         JenkinsRule.WebClient wc = r.createWebClient();
 
         // "foo" should copy "child"
-        copyFromGUI(f, wc, "foo", "xyz");
+        copyViaHttp(f, wc, "foo", "xyz");
         assertEquals("child",((Job)f.getItem("xyz")).getDescription());
 
         // "/foo" should copy "top"
-        copyFromGUI(f, wc, "/foo", "uvw");
+        copyViaHttp(f, wc, "/foo", "uvw");
         assertEquals("top",((Job)f.getItem("uvw")).getDescription());
 
     }
 
-    private void copyFromGUI(Folder f, JenkinsRule.WebClient wc, String fromName, String toName) throws Exception {
-        HtmlPage page = wc.getPage(f, "newJob");
-        ((HtmlInput)page.getElementById("name")).type(toName);
-        HtmlInput fe = (HtmlInput) page.getElementById("from");
-        fe.focus();
-        fe.type(fromName);
-        r.submit(page.getFormByName("createItem"));
+    private void copyViaHttp(Folder f, JenkinsRule.WebClient wc, String fromName, String toName) throws Exception {
+        // Taken from https://github.com/jenkinsci/jenkins/blob/80aa2c8e4093df270193402c3933f3f1f16271da/test/src/test/java/hudson/jobs/CreateItemTest.java#L68
+        r.jenkins.setCrumbIssuer(null);
+
+        URL apiURL = new URL(
+                r.jenkins.getRootUrl().toString() + "/" + f.getUrl().toString() + "createItem?mode=copy&from=" + URLEncoder.encode(fromName, "UTF-8") + "&name=" + URLEncoder.encode(toName, "UTF-8"));
+
+        WebRequest request = new WebRequest(apiURL, HttpMethod.POST);
+        request.setEncodingType(null);
+        assertTrue("Copy Job request has failed", 200 == r.createWebClient()
+                    .getPage(request).getWebResponse().getStatusCode());
     }
 
     /**
@@ -336,7 +341,10 @@ private void copyFromGUI(Folder f, JenkinsRule.WebClient wc, String fromName, St
     @Issue("JENKINS-32487")
     @Test public void shouldAssignPropertyOwnerOnCreationAndReload() throws Exception {
         Folder folder = r.jenkins.createProject(Folder.class, "myFolder");
-        r.jenkins.setAuthorizationStrategy(new ProjectMatrixAuthorizationStrategy());
+        ProjectMatrixAuthorizationStrategy as = new ProjectMatrixAuthorizationStrategy();
+        // Need to do this to avoid JENKINS-9774
+        as.add(Jenkins.ADMINISTER, "alice");
+        r.jenkins.setAuthorizationStrategy(as);
 
         // We add a stub property to generate the persisted list
         // Then we ensure owner is being assigned properly.
@@ -363,8 +371,11 @@ private void copyFromGUI(Folder f, JenkinsRule.WebClient wc, String fromName, St
         Set<String> sids = new HashSet<String>();
         sids.add("admin");
         grantedPermissions.put(Jenkins.ADMINISTER, sids);
-        folder = r.jenkins.getItemByFullName("myFolder", Folder.class); 
-        r.jenkins.setAuthorizationStrategy(new ProjectMatrixAuthorizationStrategy());
+        folder = r.jenkins.getItemByFullName("myFolder", Folder.class);
+        ProjectMatrixAuthorizationStrategy as = new ProjectMatrixAuthorizationStrategy();
+        // Need to do this to avoid JENKINS-9774
+        as.add(Jenkins.ADMINISTER, "alice");
+        r.jenkins.setAuthorizationStrategy(as);
         folder.addProperty(new com.cloudbees.hudson.plugins.folder.properties.AuthorizationMatrixProperty(grantedPermissions));
 
         // Reload folder from disk and check the state