From 1be2638dc1696bafbcbe4b1aafce75d569a03334 Mon Sep 17 00:00:00 2001 From: Vivek Pandey Date: Wed, 13 Jul 2016 13:56:54 -0700 Subject: [PATCH] JENKINS-36668# Fixed --- .../service/embedded/rest/PipelineImpl.java | 2 +- .../service/embedded/LinkResolverTest.java | 18 ++++++++++++++++++ .../service/embedded/PipelineApiTest.java | 3 --- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/PipelineImpl.java b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/PipelineImpl.java index 416806b6..6daa8b6e 100644 --- a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/PipelineImpl.java +++ b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/PipelineImpl.java @@ -155,7 +155,7 @@ public class PipelineImpl extends BluePipeline { @Override public Resource resolve(Item context, Reachable parent, Item target) { - if(context == target.getParent()){ + if(context == target && target instanceof Job) { return getPipeline(target,parent); } return null; diff --git a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/LinkResolverTest.java b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/LinkResolverTest.java index 48c3107f..18a44e12 100644 --- a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/LinkResolverTest.java +++ b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/LinkResolverTest.java @@ -43,6 +43,24 @@ public class LinkResolverTest extends BaseTest { Project p2 = folder2.createProject(FreeStyleProject.class, "test2"); Project p3 = folder3.createProject(FreeStyleProject.class, "test3"); + WorkflowJob pipelineJob1 = j.jenkins.createProject(WorkflowJob.class, "pipeline1"); + pipelineJob1.setDefinition(new CpsFlowDefinition("stage \"Build\"\n" + + " node {\n" + + " sh \"echo here\"\n" + + " }\n" + + "\n")); + + WorkflowJob pipelineJob2 = folder2.createProject(WorkflowJob.class, "pipeline2"); + pipelineJob2.setDefinition(new CpsFlowDefinition("stage \"Build\"\n" + + " node {\n" + + " sh \"echo here\"\n" + + " }\n" + + "\n")); + + + Assert.assertEquals("/blue/rest/organizations/jenkins/pipelines/pipeline1/",linkResolver.resolve(pipelineJob1).getHref()); + Assert.assertEquals("/blue/rest/organizations/jenkins/pipelines/folder1/pipelines/folder2/pipelines/pipeline2/",linkResolver.resolve(pipelineJob2).getHref()); + Assert.assertEquals("/blue/rest/organizations/jenkins/pipelines/fstyle1/",linkResolver.resolve(f).getHref()); Assert.assertEquals("/blue/rest/organizations/jenkins/pipelines/folder1/",linkResolver.resolve(folder1).getHref()); Assert.assertEquals("/blue/rest/organizations/jenkins/pipelines/folder1/pipelines/test1/",linkResolver.resolve(p1).getHref()); diff --git a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/PipelineApiTest.java b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/PipelineApiTest.java index 52bf68f9..98425116 100644 --- a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/PipelineApiTest.java +++ b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/PipelineApiTest.java @@ -567,9 +567,6 @@ public class PipelineApiTest extends BaseTest { @Override public Resource resolve(Item context, Reachable parent, Item target) { - if(context == target && target instanceof Job) { - return new TestPipelineImpl((Job) target); - } return null; } }