Skip to content

Commit 869cbe7

Browse files
authored
Merge pull request #149 from cloudogu/feature/update_bats_version_to_1.12
Update BATS image version, update CHANGELOG.md
2 parents 76a4a4e + 689860c commit 869cbe7

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88

99
## [Unreleased]
10+
### Changed
11+
- Updates the BATS shell test image to 1.12 which supports the `--report-formatter` switch
1012

1113
## [4.2.0](https://github.com/cloudogu/ces-build-lib/releases/tag/4.2.0) - 2025-04-02
1214
### Changed

src/com/cloudogu/ces/cesbuildlib/Bats.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Bats {
1313
def defaultSetupConfig = [
1414
bats_base_image : "bats/bats",
1515
bats_custom_image: "cloudogu/bats",
16-
bats_tag : "1.2.1"
16+
bats_tag : "1.12.0"
1717
]
1818

1919
Bats(script, docker) {

test/com/cloudogu/ces/cesbuildlib/BatsTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BatsTest {
3737
// given
3838
Docker dockerMock = mock(Docker.class)
3939
Docker.Image imageMock = mock(Docker.Image.class)
40-
when(dockerMock.build("cloudogu/bats:1.2.1", "--build-arg=BATS_BASE_IMAGE=bats/bats --build-arg=BATS_TAG=1.2.1 ./build/make/bats")).thenReturn(imageMock)
40+
when(dockerMock.build("cloudogu/bats:1.12.0", "--build-arg=BATS_BASE_IMAGE=bats/bats --build-arg=BATS_TAG=1.12.0 ./build/make/bats")).thenReturn(imageMock)
4141
when(imageMock.inside(anyString(), any())).thenAnswer(new Answer<Object>() {
4242
@Override
4343
Object answer(InvocationOnMock invocation) throws Throwable {
@@ -53,9 +53,9 @@ class BatsTest {
5353

5454
// then
5555
assertThat(scriptMock.actualEcho[0].trim()).contains("Executing bats tests with config:")
56-
assertThat(scriptMock.actualEcho[1].trim()).contains("[bats_base_image:bats/bats, bats_custom_image:cloudogu/bats, bats_tag:1.2.1]")
56+
assertThat(scriptMock.actualEcho[1].trim()).contains("[bats_base_image:bats/bats, bats_custom_image:cloudogu/bats, bats_tag:1.12.0]")
5757

58-
verify(dockerMock).build("cloudogu/bats:1.2.1", "--build-arg=BATS_BASE_IMAGE=bats/bats --build-arg=BATS_TAG=1.2.1 ./build/make/bats")
58+
verify(dockerMock).build("cloudogu/bats:1.12.0", "--build-arg=BATS_BASE_IMAGE=bats/bats --build-arg=BATS_TAG=1.12.0 ./build/make/bats")
5959
verify(imageMock).inside(eq("--entrypoint='' -v :/workspace -v /testdir:/usr/share/webapps"), any())
6060

6161
assertEquals("true", scriptMock.actualJUnitFlags["allowEmptyResults"].toString())

0 commit comments

Comments
 (0)