Merge pull request #26 from ixdy/uri-requirement-builder-bugfix

Fix a small bug in URIRequirementBuilder.
jenkinsci · Jul 2, 2015 · 5adb2a2 · 5adb2a2
2 parents a6c40a1 + f5947cc
commit 5adb2a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/domains/URIRequirementBuilder.java b/src/main/java/com/cloudbees/plugins/credentials/domains/URIRequirementBuilder.java
@@ -196,7 +196,7 @@ public URIRequirementBuilder withScheme(@CheckForNull String scheme) {
      */
     @NonNull
     public URIRequirementBuilder withPath(@CheckForNull String path) {
-        withoutScheme();
+        withoutPath();
         if (path != null) {
             requirements.add(new PathRequirement(path));
         }

diff --git a/src/test/java/com/cloudbees/plugins/credentials/domains/DomainTest.java b/src/test/java/com/cloudbees/plugins/credentials/domains/DomainTest.java
@@ -48,14 +48,15 @@ public void smokes() throws Exception {
     public void pathRequirements() throws Exception {
         Domain instance =
                 new Domain("test federation", "the instance under test", Arrays.<DomainSpecification>asList(
-                        new SchemeSpecification("http, https, svn, git, pop3, imap, spdy"),
+                        new SchemeSpecification("https"),
                         new HostnameSpecification("*.jenkins-ci.org", null),
                         new PathSpecification("/download/**/jenkins.war", null, false)));
 
         assertThat(instance.test(), is(true));
         assertThat(instance.test(URIRequirementBuilder.fromUri("https://updates.jenkins-ci.org/download/1.532/jenkins.war").build()), is(true));
         assertThat(instance.test(URIRequirementBuilder.fromUri("https://updates.jenkins-ci.org/download/jenkins.war").build()), is(true));
         assertThat(instance.test(URIRequirementBuilder.fromUri("https://updates.jenkins-ci.org/download/1/2/3/jenkins.war").build()), is(true));
+        assertThat(instance.test(URIRequirementBuilder.fromUri("http://updates.jenkins-ci.org/download/1/2/3/jenkins.war").build()), is(false));
 
     }
 }