Skip to content

[JENKINS-46257] Improve Run Parameters folders support for auto-completion #26339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flamki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[JENKINS-46257] Improve Run Parameters folders support for auto-completion #26339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/src/main/java/hudson/model/RunParameterDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.Stapler;
Expand Down Expand Up @@ -154,8 +155,9 @@ public ParameterDefinition newInstance(StaplerRequest2 req, JSONObject formData)
return req.bindJSON(RunParameterDefinition.class, formData);
}

public AutoCompletionCandidates doAutoCompleteProjectName(@QueryParameter String value) {
return AutoCompletionCandidates.ofJobNames(Job.class, value, null, Jenkins.get());
public AutoCompletionCandidates doAutoCompleteProjectName(
@QueryParameter String value, @AncestorInPath Item self, @AncestorInPath ItemGroup container) {
return AutoCompletionCandidates.ofJobNames(Job.class, value, self, container);
}

}
Expand Down
19 changes: 19 additions & 0 deletions test/src/test/java/hudson/model/RunParameterDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
import hudson.tasks.BuildStepMonitor;
import hudson.tasks.Publisher;
import hudson.util.LogTaskListener;
import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -95,6 +97,19 @@ void inFolders() throws Exception {
assertEquals("2", env.get("build_NUMBER"));
}

@Issue("JENKINS-46257")
@Test
void autoCompleteProjectNameInFoldersUsesLocalContext() throws Exception {
MockFolder folder = j.createFolder("folder");
FreeStyleProject self = folder.createProject(FreeStyleProject.class, "self");
folder.createProject(FreeStyleProject.class, "sibling");

RunParameterDefinition.DescriptorImpl descriptor = j.jenkins.getDescriptorByType(RunParameterDefinition.DescriptorImpl.class);
AutoCompletionCandidates candidates = descriptor.doAutoCompleteProjectName("si", self, self.getParent());

assertContains(candidates, "sibling");
}

@Test
void testNULLFilter() throws Exception {

Expand Down Expand Up @@ -301,4 +316,8 @@ public Descriptor<Publisher> getDescriptor() {
return new Descriptor<>(ResultPublisher.class) {};
}
}

private void assertContains(AutoCompletionCandidates candidates, String... values) {
assertEquals(new TreeSet<>(Arrays.asList(values)), new TreeSet<>(candidates.getValues()));
}
}
Loading