From 57964076d819f95da04eece59bf43587660c1aed Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 26 Aug 2020 15:59:43 -0400 Subject: [PATCH 1/2] [JENKINS-63516] Do not test password parameters with the input step --- .../rest/impl/pipeline/parallelStepsFromPost.jenkinsfile | 1 - .../blueocean/rest/impl/pipeline/stepsFromPost.jenkinsfile | 1 - 2 files changed, 2 deletions(-) diff --git a/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/parallelStepsFromPost.jenkinsfile b/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/parallelStepsFromPost.jenkinsfile index 69fc1ead41e..293bfcc79b8 100644 --- a/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/parallelStepsFromPost.jenkinsfile +++ b/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/parallelStepsFromPost.jenkinsfile @@ -36,7 +36,6 @@ pipeline { input(message: 'User input required', ok: 'Engage!', parameters: [ string(name: 'STRING', description: 'String Param', defaultValue: 'Hello'), text(name: 'TEXT', description: 'Text Param', defaultValue: 'This is a\nmulti line string'), - password(name: 'PASSWORD', description: 'Password Param', defaultValue: 'foo'), booleanParam(name: 'BOOLEAN', description: 'Boolean Param', defaultValue: false), choice( name: 'CHOICE', diff --git a/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/stepsFromPost.jenkinsfile b/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/stepsFromPost.jenkinsfile index 37f34c23f7e..274c497a9fb 100644 --- a/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/stepsFromPost.jenkinsfile +++ b/blueocean-pipeline-api-impl/src/test/resources/io/jenkins/blueocean/rest/impl/pipeline/stepsFromPost.jenkinsfile @@ -13,7 +13,6 @@ pipeline { input(message: 'User input required', ok: 'Engage!', parameters: [ string(name: 'STRING', description: 'String Param', defaultValue: 'Hello'), text(name: 'TEXT', description: 'Text Param', defaultValue: 'This is a\nmulti line string'), - password(name: 'PASSWORD', description: 'Password Param', defaultValue: 'foo'), booleanParam(name: 'BOOLEAN', description: 'Boolean Param', defaultValue: false), choice( name: 'CHOICE', From e18dfbf516e44a6524ee0f090371f15a8f51a498 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 26 Aug 2020 16:18:54 -0400 Subject: [PATCH 2/2] Fix TryBlueOceanMenuTest.testOpenBlueOcean when running against Jenkins 2.238+ --- .../blueocean/service/embedded/TryBlueOceanMenuTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenuTest.java b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenuTest.java index 336e3738104..ffa287e0b74 100644 --- a/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenuTest.java +++ b/blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenuTest.java @@ -9,6 +9,9 @@ import java.io.IOException; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Vivek Pandey */ @@ -19,6 +22,6 @@ public void testOpenBlueOcean() throws IOException, SAXException { HtmlPage page = webClient.getPage(j.getInstance()); HtmlAnchor anchor = page.getAnchorByText(Messages.BlueOceanUrlAction_DisplayName()); Assert.assertEquals("/jenkins/blue/organizations/jenkins/pipelines/", anchor.getHrefAttribute()); - Assert.assertEquals("task-link", anchor.getAttribute("class")); + assertThat(anchor.getAttribute("class"), containsString("task-link")); } }