From 42c1032f0660238e51ae41e5864ab510c0779ac2 Mon Sep 17 00:00:00 2001 From: Marcus Holl Date: Thu, 30 Aug 2018 08:52:15 +0200 Subject: [PATCH 1/2] [docu] fix markup The coding box was too long since the closing markup for the code box had a leading blank, hence the end of the code box was not properly detected. --- documentation/docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/configuration.md b/documentation/docs/configuration.md index 1313d22a7..3655ab2bb 100644 --- a/documentation/docs/configuration.md +++ b/documentation/docs/configuration.md @@ -60,7 +60,7 @@ steps: newmanCollection: 'myNewmanCollection.file' newmanEnvironment: 'myNewmanEnvironment' newmanGlobals: 'myNewmanGlobals' - ``` +``` ## Access to configuration from custom scripts From f2feb8f5ad99175224b244f0faab47b830e46d7e Mon Sep 17 00:00:00 2001 From: Marcus Holl Date: Fri, 31 Aug 2018 14:13:11 +0200 Subject: [PATCH 2/2] Ensure consistent location for files used by versioning tests (#278) --- test/groovy/ArtifactSetVersionTest.groovy | 2 +- .../sap/piper/versioning/DockerArtifactVersioningTest.groovy | 2 +- .../com/sap/piper/versioning/MavenArtifactVersioningTest.groovy | 2 +- .../{ => versioning}/DockerArtifactVersioning/Dockerfile | 0 test/resources/{ => versioning}/MavenArtifactVersioning/pom.xml | 0 .../{ => versioning}/MavenArtifactVersioning/snapshot/pom.xml | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename test/resources/{ => versioning}/DockerArtifactVersioning/Dockerfile (100%) rename test/resources/{ => versioning}/MavenArtifactVersioning/pom.xml (100%) rename test/resources/{ => versioning}/MavenArtifactVersioning/snapshot/pom.xml (100%) diff --git a/test/groovy/ArtifactSetVersionTest.groovy b/test/groovy/ArtifactSetVersionTest.groovy index fd0faa716..c753aa0f5 100644 --- a/test/groovy/ArtifactSetVersionTest.groovy +++ b/test/groovy/ArtifactSetVersionTest.groovy @@ -41,7 +41,7 @@ class ArtifactSetVersionTest extends BasePiperTest { .around(thrown) .around(jlr) .around(jscr) - .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning')) + .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning')) .around(jwfr) .around(jder) .around(jsr) diff --git a/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy b/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy index 31ff8fc79..99a8c716b 100644 --- a/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy +++ b/test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy @@ -20,7 +20,7 @@ class DockerArtifactVersioningTest extends BasePiperTest{ String passedDir - JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/DockerArtifactVersioning') + JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/versioning/DockerArtifactVersioning') JenkinsWriteFileRule jwfr = new JenkinsWriteFileRule(this) JenkinsLoggingRule jlr = new JenkinsLoggingRule(this) ExpectedException thrown = ExpectedException.none() diff --git a/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy b/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy index 3b96ea008..d3b0a6020 100644 --- a/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy +++ b/test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy @@ -24,7 +24,7 @@ class MavenArtifactVersioningTest extends BasePiperTest{ public RuleChain ruleChain = Rules .getCommonRules(this) .around(jscr) - .around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning')) + .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning')) @Before void init() { diff --git a/test/resources/DockerArtifactVersioning/Dockerfile b/test/resources/versioning/DockerArtifactVersioning/Dockerfile similarity index 100% rename from test/resources/DockerArtifactVersioning/Dockerfile rename to test/resources/versioning/DockerArtifactVersioning/Dockerfile diff --git a/test/resources/MavenArtifactVersioning/pom.xml b/test/resources/versioning/MavenArtifactVersioning/pom.xml similarity index 100% rename from test/resources/MavenArtifactVersioning/pom.xml rename to test/resources/versioning/MavenArtifactVersioning/pom.xml diff --git a/test/resources/MavenArtifactVersioning/snapshot/pom.xml b/test/resources/versioning/MavenArtifactVersioning/snapshot/pom.xml similarity index 100% rename from test/resources/MavenArtifactVersioning/snapshot/pom.xml rename to test/resources/versioning/MavenArtifactVersioning/snapshot/pom.xml